Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(CI): re-order checkout's for correct use of ngen submodule build … #20

Merged
merged 3 commits into from
Jun 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 25 additions & 6 deletions .github/workflows/ngen_integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,36 @@ jobs:
mkdir ${{runner.temp}}/smp
mv ./* ${{runner.temp}}/smp

# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: checkout actions in another repo
- name: Build CFE
uses: actions/checkout@v4
with:
repository: noaa-owp/ngen
repository: noaa-owp/cfe

- name: Build CFE
# Checkout and build CFE
- name: Checkout the commit
uses: actions/checkout@v4
with:
repository: noaa-owp/cfe

- name: Build CFE Library
run: |
cmake -B cmake_build -S . -DNGEN=ON
make -C cmake_build


- name: Save CFE to a Temp Directory
run: |
# Move files to a temporary directory
mkdir ${{runner.temp}}/cfe
mv ./* ${{runner.temp}}/cfe

# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
# Checkout ngen after cfe checkout so $GITHUB_WORKSPACE doesn't get clobbered
# otherwise the submod action isn't available
- name: checkout actions in another repo
uses: actions/checkout@v4
with:
repository: noaa-owp/ngen

- name: Build Topmodel
id: submod_build_2
uses: ./.github/actions/ngen-submod-build
Expand Down Expand Up @@ -98,6 +112,11 @@ jobs:
rm -rf extern/SoilMoistureProfiles/SoilMoistureProfiles/*
mv ${{runner.temp}}/smp/* extern/SoilMoistureProfiles/SoilMoistureProfiles

- name: Move CFE Files Including cmake_build to Appropriate Directory
run: |
rm -rf extern/cfe/cfe/*
mv ${{runner.temp}}/cfe/* extern/cfe/cfe

- name: Run Ngen Test for SMP
run: |
mv ${{ steps.ngen_id1.outputs.build-dir }} ./ngen-build/
Expand Down
2 changes: 1 addition & 1 deletion realizations/realization_config_smp_cfe.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"Qb_topmodel": "sloth_Qb_topmodel",
"Qv_topmodel": "sloth_Qv_topmodel",
"global_deficit" : "sloth_global_deficit",
"sloth_soil_moisture_wetting_fronts": "soil_moisture_wetting_fronts",
"soil_moisture_wetting_fronts": "sloth_soil_moisture_wetting_fronts",
"soil_depth_wetting_fronts" : "sloth_soil_depth_wetting_fronts",
"num_wetting_fronts" : "sloth_num_wetting_fronts"
},
Expand Down
Loading