diff --git a/.github/workflows/ngen_integration.yaml b/.github/workflows/ngen_integration.yaml index c761ce0..4214643 100644 --- a/.github/workflows/ngen_integration.yaml +++ b/.github/workflows/ngen_integration.yaml @@ -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 @@ -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/ diff --git a/realizations/realization_config_smp_cfe.json b/realizations/realization_config_smp_cfe.json index 005a47e..ef57238 100644 --- a/realizations/realization_config_smp_cfe.json +++ b/realizations/realization_config_smp_cfe.json @@ -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" },