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.

Sign up for GitHub

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

Update to ESMA_cmake v3.16.0 #1540

Merged
merged 2 commits into from
Jun 3, 2022
Merged

Update to ESMA_cmake v3.16.0 #1540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a019512
Update to ESMA_cmake v3.16.0
mathomp4 Jun 3, 2022
630154c
Update GitHub Actions
mathomp4 Jun 3, 2022
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
81 changes: 4 additions & 77 deletions .github/workflows/workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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.uint.cloudmunity/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
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ 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
- Updated GitHub Actions MAPL build tests

### Removed

Expand Down
2 changes: 1 addition & 1 deletion components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down