From a01951218db158ec96d0715e7bdbdfdc1aef6f22 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 3 Jun 2022 12:25:32 -0400 Subject: [PATCH 1/2] Update to ESMA_cmake v3.16.0 --- CHANGELOG.md | 1 + components.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a5d75749721..fc9a8e1e289d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Modified error messages in FileMetadataUtilities to be unique and print filename +- Updated the ESMA_cmake version to v3.16.0 ### Removed diff --git a/components.yaml b/components.yaml index 9e5748618313..d84e5e3017a0 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ ESMA_env: ESMA_cmake: local: ./ESMA_cmake remote: ../ESMA_cmake.git - tag: v3.12.0 + tag: v3.16.0 develop: develop ecbuild: From 630154c5bbcba612396d5f917da326e821d1acce Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 3 Jun 2022 12:43:14 -0400 Subject: [PATCH 2/2] Update GitHub Actions --- .github/workflows/workflow.yml | 81 ++-------------------------------- CHANGELOG.md | 1 + 2 files changed, 5 insertions(+), 77 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index b86cbbc3aa35..05fa5f62f17a 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -17,7 +17,7 @@ jobs: name: Build and Test MAPL runs-on: ubuntu-latest container: - image: gmao/ubuntu20-geos-env-mkl:v6.2.8-openmpi_4.0.6-gcc_11.2.0 + image: gmao/ubuntu20-geos-env-mkl:v6.2.13-openmpi_4.1.2-gcc_11.2.0 # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495 # It seems like we might not need secrets on GitHub Actions which is good for forked # pull requests @@ -30,7 +30,7 @@ jobs: OMPI_MCA_btl_vader_single_copy_mechanism: none steps: - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.9.0 + uses: styfle/cancel-workflow-action@0.9.1 with: access_token: ${{ github.token }} - name: Checkout @@ -62,84 +62,11 @@ jobs: make -j4 build-tests # skip performance tests ctest -R MAPL -LE PERFORMANCE --output-on-failure - ############################################################################################################################################################ - # build_gcm: # - # name: Build GEOSgcm # - # if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')" # - # runs-on: ubuntu-latest # - # container: # - # image: gmao/ubuntu20-geos-env-mkl:v6.2.8-openmpi_4.0.6-gcc_11.2.0 # - # env: # - # OMPI_ALLOW_RUN_AS_ROOT: 1 # - # OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1 # - # OMPI_MCA_btl_vader_single_copy_mechanism: none # - # steps: # - # - name: Cancel Previous Runs # - # uses: styfle/cancel-workflow-action@0.9.0 # - # with: # - # access_token: ${{ github.token }} # - # - name: Checkout GCM # - # uses: actions/checkout@v2 # - # with: # - # repository: GEOS-ESM/GEOSgcm # - # fetch-depth: 1 # - # - name: Versions etc. # - # run: | # - # gfortran --version # - # mpirun --version # - # echo $BASEDIR # - # echo ${GITHUB_HEAD_REF} # - # echo ${{github.ref}} # - # echo ${{github.head_ref}} # - # - name: Mepo clone external repos # - # run: | # - # mepo init # - # mepo clone # - # mepo status # - # mepo develop GEOSgcm_GridComp GEOSgcm_App # - # mepo status # - # # The next two actions use: # - # # https://github.community/t/is-there-a-way-to-tell-if-a-pr-is-from-a-forked-repository/134186/7?u=mathomp4 # - # # to test if you are in a fork or not # - # - name: Git checkout MAPL branch (forks) # - # if: github.event.pull_request.head.repo.full_name != github.repository # - # working-directory: ./src/Shared/@MAPL # - # run: | # - # # GITHUB_REF will look like 'refs/pull/669/merge' and we want 'pull/669' # - # GITHUB_REF_STRIP_REFS=${GITHUB_REF##refs/} # - # GITHUB_REF_STRIP_MERGE=${GITHUB_REF_STRIP_REFS%%/merge} # - # # This was figured out with looking at CircleCI output # - # git fetch --force origin "${GITHUB_REF_STRIP_MERGE}/head:remotes/origin/${GITHUB_REF_STRIP_MERGE}" # - # mepo checkout ${GITHUB_REF_STRIP_MERGE} MAPL # - # mepo status # - # # If we are in the same org, this will work # - # - name: Mepo checkout MAPL branch (same org), MAPL on main/develop # - # if: github.event.pull_request.head.repo.full_name == github.repository && (github.head_ref == 'main' || github.head_ref == 'develop') # - # run: | # - # mepo checkout ${GITHUB_HEAD_REF} MAPL # - # mepo status # - # # If we are in the same org, this will work # - # - name: Mepo checkout MAPL branch (same org), MAPL not on main/develop # - # if: github.event.pull_request.head.repo.full_name == github.repository && (github.head_ref != 'main' && github.head_ref != 'develop') # - # run: | # - # mepo checkout ${GITHUB_HEAD_REF} MAPL # - # mepo checkout-if-exists ${GITHUB_HEAD_REF} # - # mepo status # - # - name: CMake # - # run: | # - # mkdir build # - # cd build # - # cmake .. -DBASEDIR=$BASEDIR/Linux -DCMAKE_Fortran_COMPILER=gfortran -DCMAKE_BUILD_TYPE=Debug -DMPIEXEC_PREFLAGS='--oversubscribe' -DUSE_F2PY=OFF # - # - name: Build # - # run: | # - # cd build # - # make -j4 install # - ############################################################################################################################################################ build_test_mapl_intel: name: Build and Test MAPL Intel runs-on: ubuntu-latest container: - image: gmao/ubuntu20-geos-env:v6.2.8-intelmpi_2021.3.0-intel_2021.3.0 + image: gmao/ubuntu20-geos-env:v6.2.13-intelmpi_2021.3.0-intel_2021.3.0 # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495 # It seems like we might not need secrets on GitHub Actions which is good for forked # pull requests @@ -148,7 +75,7 @@ jobs: #password: ${{ secrets.DOCKERHUB_TOKEN }} steps: - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.9.0 + uses: styfle/cancel-workflow-action@0.9.1 with: access_token: ${{ github.token }} - name: Checkout diff --git a/CHANGELOG.md b/CHANGELOG.md index fc9a8e1e289d..a4ae276cef82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Modified error messages in FileMetadataUtilities to be unique and print filename - Updated the ESMA_cmake version to v3.16.0 +- Updated GitHub Actions MAPL build tests ### Removed