From f78aaac63caeae81c325f2dce5ef84f4c8ea4c70 Mon Sep 17 00:00:00 2001 From: alejandrobodas Date: Wed, 20 Mar 2024 19:28:45 +0000 Subject: [PATCH 1/6] Update continuous_integration.yml --- .github/workflows/continuous_integration.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index db5810b636..10c5ee4f67 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -39,6 +39,9 @@ jobs: matrix: compiler: [gfortran-10, gfortran-11, gfortran-12] python-version: [3.11] + include: + - compiler_short_name: gfortran + - kgo_version: v001 defaults: run: shell: bash -el {0} @@ -49,11 +52,11 @@ jobs: NFHOME: /usr ATOL: 0.0 RTOL: 0.0 - KGO_VERSION: v002 + KGO_VERSION: ${{ matrix.kgo_version }} GDKGO1: https://docs.google.com/uc?export=download&id=11dKcIL3EQr7s6jbo4f9GsoW0SufesGbq GDKGO2: https://docs.google.com/uc?export=download&id=1s5Ha6Hqnv_hWbRUs8KQpJ4Lxy8uvJDar GDKGO3: https://docs.google.com/uc?export=download&id=1kY1lRgzd0UhDiQef2u-VgTQql_iut3U2 - F90_SHORT_NAME: gfortran + F90_SHORT_NAME: ${{ matrix.compiler_short_name }} # Sequence of tasks that will be executed as part of the job steps: ############################################################################### @@ -176,7 +179,7 @@ jobs: python plot_test_outputs.py --tst_file=$TST_MLEV fi cd data/outputs/UKMO - tar --ignore-failed-read -czf outputs.UKMO.tgz cosp2_output.um_global.nc \ + tar --ignore-failed-read -czf outputs.${{ matrix.compiler }}.UKMO.tgz cosp2_output.um_global.nc \ cosp2_output_um.nc cosp2_output.um_global_model_levels.nc *.png \ cosp2_output.um_global.out ls -lh @@ -187,5 +190,5 @@ jobs: if: failure() uses: actions/upload-artifact@v4.3.1 with: - name: outputs.UKMO.tgz - path: driver/data/outputs/UKMO/outputs.UKMO.tgz + name: outputs.${{ matrix.compiler }}.UKMO.tgz + path: driver/data/outputs/UKMO/outputs.${{ matrix.compiler }}.UKMO.tgz From e590fa9c0b8a63df696a5915104505ff1e6b1604 Mon Sep 17 00:00:00 2001 From: alejandrobodas Date: Wed, 20 Mar 2024 19:34:01 +0000 Subject: [PATCH 2/6] Update continuous_integration.yml --- .github/workflows/continuous_integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 10c5ee4f67..94ec231412 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -41,7 +41,7 @@ jobs: python-version: [3.11] include: - compiler_short_name: gfortran - - kgo_version: v001 + - kgo_version: v002 defaults: run: shell: bash -el {0} From 2c3a7792233397a1da2f262c3a1aeb19425306f1 Mon Sep 17 00:00:00 2001 From: alejandrobodas Date: Wed, 20 Mar 2024 19:46:13 +0000 Subject: [PATCH 3/6] Update containerized-ci.yml --- .github/workflows/containerized-ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/containerized-ci.yml b/.github/workflows/containerized-ci.yml index c8fd7d6b10..fc3fbbe0b0 100644 --- a/.github/workflows/containerized-ci.yml +++ b/.github/workflows/containerized-ci.yml @@ -24,6 +24,8 @@ jobs: image: ghcr.io/earth-system-radiation/rte-rrtmgp-ci:oneapi - compiler: ifx image: ghcr.io/earth-system-radiation/rte-rrtmgp-ci:oneapi + # Common variables + - kgo_version: v001 container: image: ${{ matrix.image }} env: @@ -35,7 +37,7 @@ jobs: # KGO tests variables ATOL: 0.0 RTOL: 0.0 - KGO_VERSION: v002 + KGO_VERSION: ${{ matrix.kgo_version }} GDKGO1: ${{ matrix.gdkgo1 }} GDKGO2: ${{ matrix.gdkgo2 }} steps: @@ -123,7 +125,7 @@ jobs: python plot_test_outputs.py --tst_file=$TST_MLEV fi cd data/outputs/UKMO - tar --ignore-failed-read -czf outputs.UKMO.tgz cosp2_output.um_global.nc \ + tar --ignore-failed-read -czf outputs.${{ matrix.compiler }}.UKMO.tgz cosp2_output.um_global.nc \ cosp2_output_um.nc cosp2_output.um_global_model_levels.nc *.png \ cosp2_output.um_global.out ls -lh @@ -134,5 +136,5 @@ jobs: if: failure() uses: actions/upload-artifact@v4.3.1 with: - name: outputs.UKMO.tgz + name: outputs.${{ matrix.compiler }}.UKMO.tgz path: driver/data/outputs/UKMO/outputs.UKMO.tgz From effea1a40bc4ab80faa5e953e86298d6b9477172 Mon Sep 17 00:00:00 2001 From: alejandrobodas Date: Wed, 20 Mar 2024 19:51:37 +0000 Subject: [PATCH 4/6] Update containerized-ci.yml --- .github/workflows/containerized-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/containerized-ci.yml b/.github/workflows/containerized-ci.yml index fc3fbbe0b0..6c578ad1ce 100644 --- a/.github/workflows/containerized-ci.yml +++ b/.github/workflows/containerized-ci.yml @@ -137,4 +137,4 @@ jobs: uses: actions/upload-artifact@v4.3.1 with: name: outputs.${{ matrix.compiler }}.UKMO.tgz - path: driver/data/outputs/UKMO/outputs.UKMO.tgz + path: driver/data/outputs/UKMO/outputs.${{ matrix.compiler }}.UKMO.tgz From f7cd01ad82c842b1b3525d5da058b7154b08f21d Mon Sep 17 00:00:00 2001 From: alejandrobodas Date: Wed, 20 Mar 2024 20:42:05 +0000 Subject: [PATCH 5/6] Update containerized-ci.yml --- .github/workflows/containerized-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/containerized-ci.yml b/.github/workflows/containerized-ci.yml index 6c578ad1ce..248123af7e 100644 --- a/.github/workflows/containerized-ci.yml +++ b/.github/workflows/containerized-ci.yml @@ -25,7 +25,7 @@ jobs: - compiler: ifx image: ghcr.io/earth-system-radiation/rte-rrtmgp-ci:oneapi # Common variables - - kgo_version: v001 + - kgo_version: v002 container: image: ${{ matrix.image }} env: @@ -133,7 +133,7 @@ jobs: # Make output files available if any test fails ############################################################################### - name: Upload output file if test fails - if: failure() + if: success() uses: actions/upload-artifact@v4.3.1 with: name: outputs.${{ matrix.compiler }}.UKMO.tgz From 8e2be09bd0f78f0bf47c90733cd3c98bcab6e7ad Mon Sep 17 00:00:00 2001 From: alejandrobodas Date: Wed, 20 Mar 2024 20:51:34 +0000 Subject: [PATCH 6/6] Update containerized-ci.yml --- .github/workflows/containerized-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/containerized-ci.yml b/.github/workflows/containerized-ci.yml index 248123af7e..00d947b90b 100644 --- a/.github/workflows/containerized-ci.yml +++ b/.github/workflows/containerized-ci.yml @@ -133,7 +133,7 @@ jobs: # Make output files available if any test fails ############################################################################### - name: Upload output file if test fails - if: success() + if: failure() uses: actions/upload-artifact@v4.3.1 with: name: outputs.${{ matrix.compiler }}.UKMO.tgz