From 7ff18691592fc1b34bdfa7a984150e2114244831 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 30 Apr 2021 15:10:49 -0600 Subject: [PATCH 1/7] try this tag change --- .github/workflows/bumpversion.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/bumpversion.yml b/.github/workflows/bumpversion.yml index c682973c41..3b3fdb54f8 100644 --- a/.github/workflows/bumpversion.yml +++ b/.github/workflows/bumpversion.yml @@ -8,13 +8,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - with: - fetch-depth: '0' - name: Bump version and push tag - uses: anothrNick/github-tag-action@1.26.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - WITH_V: true - DEFAULT_BUMP: minor - RELEASE_BRANCHES: master - DRY_RUN: False + id: tag_version + uses: mathieudutour/github-tag-action@v5.5 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + create_annotated_tag: true + default_bump: patch + dry_run: true From 917bba265d172704c5d121f9235af860b3a834fb Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 30 Apr 2021 15:16:31 -0600 Subject: [PATCH 2/7] bump external versions, test bumpversion workflow --- .github/workflows/bumpversion.yml | 3 +++ .github/workflows/extbuild.yml | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bumpversion.yml b/.github/workflows/bumpversion.yml index 3b3fdb54f8..5e632337f9 100644 --- a/.github/workflows/bumpversion.yml +++ b/.github/workflows/bumpversion.yml @@ -3,6 +3,9 @@ on: push: branches: - master + pull_request: + branches: + - master jobs: build: runs-on: ubuntu-latest diff --git a/.github/workflows/extbuild.yml b/.github/workflows/extbuild.yml index 845129bb4c..da02d62344 100644 --- a/.github/workflows/extbuild.yml +++ b/.github/workflows/extbuild.yml @@ -18,10 +18,10 @@ jobs: CXX: mpicxx CPPFLAGS: "-I/usr/include -I/usr/local/include" # Versions of all dependencies can be updated here - ESMF_VERSION: ESMF_8_1_0_beta_snapshot_25 - PNETCDF_VERSION: pnetcdf-1.12.1 + ESMF_VERSION: ESMF_8_1_1 + PNETCDF_VERSION: pnetcdf-1.12.2 NETCDF_FORTRAN_VERSION: v4.5.2 - PIO_VERSION: pio-2.5.1 + PIO_VERSION: pio-2.5.4 steps: - uses: actions/checkout@v2 # Build the ESMF library, if the cache contains a previous build From 4d0ee88d4ec37ee05a11cad3bc41c2867fbbd732 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 30 Apr 2021 15:20:01 -0600 Subject: [PATCH 3/7] dry run test succeeded, turn it on --- .github/workflows/bumpversion.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/bumpversion.yml b/.github/workflows/bumpversion.yml index 5e632337f9..193aa2fff3 100644 --- a/.github/workflows/bumpversion.yml +++ b/.github/workflows/bumpversion.yml @@ -3,9 +3,6 @@ on: push: branches: - master - pull_request: - branches: - - master jobs: build: runs-on: ubuntu-latest @@ -18,4 +15,4 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} create_annotated_tag: true default_bump: patch - dry_run: true + dry_run: false From a04ecd6a4d687f461670d8ee9a817b46b3f25023 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 30 Apr 2021 16:04:00 -0600 Subject: [PATCH 4/7] fix pio version --- .github/workflows/extbuild.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/extbuild.yml b/.github/workflows/extbuild.yml index da02d62344..c22c9022e5 100644 --- a/.github/workflows/extbuild.yml +++ b/.github/workflows/extbuild.yml @@ -21,7 +21,9 @@ jobs: ESMF_VERSION: ESMF_8_1_1 PNETCDF_VERSION: pnetcdf-1.12.2 NETCDF_FORTRAN_VERSION: v4.5.2 + # These should match in number PIO_VERSION: pio-2.5.4 + PIO_VERSION_DUMB: pio2_5_4 steps: - uses: actions/checkout@v2 # Build the ESMF library, if the cache contains a previous build @@ -93,7 +95,7 @@ jobs: - name: Build PIO if: steps.cache-PIO.outputs.cache-hit != 'true' run: | - wget https://github.com/NCAR/ParallelIO/releases/download/pio_2_5_1/${{ env.PIO_VERSION }}.tar.gz + wget https://github.com/NCAR/ParallelIO/releases/download/${{ env.PIO_VERSION_DUMB }}/${{ env.PIO_VERSION }}.tar.gz tar -xzvf ${{ env.PIO_VERSION }}.tar.gz mkdir build-pio pushd build-pio From fa399fe9e9ec5409701c9c6c39af1a83ad48d404 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 30 Apr 2021 16:35:19 -0600 Subject: [PATCH 5/7] fix pio build --- .github/workflows/extbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/extbuild.yml b/.github/workflows/extbuild.yml index c22c9022e5..b0c903ac6d 100644 --- a/.github/workflows/extbuild.yml +++ b/.github/workflows/extbuild.yml @@ -99,7 +99,7 @@ jobs: tar -xzvf ${{ env.PIO_VERSION }}.tar.gz mkdir build-pio pushd build-pio - cmake -Wno-dev -DNetCDF_C_LIBRARY=/usr/lib/x86_64-linux-gnu/libnetcdf.so -DNetCDF_C_INCLUDE_DIR=/usr/include -DCMAKE_PREFIX_PATH=/usr -DCMAKE_INSTALL_PREFIX=$HOME/pio -DPIO_HDF5_LOGGING=On -DPIO_USE_MALLOC=On -DPIO_ENABLE_LOGGING=On -DPIO_ENABLE_TIMING=Off -DNetCDF_Fortran_PATH=$HOME/netcdf-fortran -DPnetCDF_PATH=$HOME/pnetcdf ../${{ env.PIO_VERSION }} + cmake -Wno-dev -DNetCDF_C_LIBRARY=/usr/lib/x86_64-linux-gnu/libnetcdf.so -DNetCDF_C_INCLUDE_DIR=/usr/include -DCMAKE_PREFIX_PATH=/usr -DCMAKE_INSTALL_PREFIX=$HOME/pio -DPIO_HDF5_LOGGING=Off -DPIO_ENABLE_EXAMPLES=Off -DPIO_ENABLE_LOGGING=Off -DPIO_ENABLE_TIMING=Off -DNetCDF_Fortran_PATH=$HOME/netcdf-fortran -DPnetCDF_PATH=$HOME/pnetcdf ../${{ env.PIO_VERSION }} make VERBOSE=1 make install popd From 17c97c3705b5e7965d314beb5724be23035050d0 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Sat, 1 May 2021 07:27:47 -0600 Subject: [PATCH 6/7] try adding netcdf-dev --- .github/workflows/extbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/extbuild.yml b/.github/workflows/extbuild.yml index b0c903ac6d..c19cf87154 100644 --- a/.github/workflows/extbuild.yml +++ b/.github/workflows/extbuild.yml @@ -34,7 +34,7 @@ jobs: path: ~/ESMF key: ${{ runner.os }}-${{ env.ESMF_VERSION }}-ESMF - id: load-env - run: sudo apt-get install gfortran wget openmpi-bin netcdf-bin libopenmpi-dev + run: sudo apt-get install gfortran wget openmpi-bin netcdf-bin libopenmpi-dev netcdf-dev - id: build-ESMF if: steps.cache-esmf.outputs.cache-hit != 'true' run: | From c8b95e3aa2ac599ded8695c4425af5fe51735ac8 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Sat, 1 May 2021 07:30:45 -0600 Subject: [PATCH 7/7] try adding libnetcdf-dev --- .github/workflows/extbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/extbuild.yml b/.github/workflows/extbuild.yml index c19cf87154..7dd99b5e92 100644 --- a/.github/workflows/extbuild.yml +++ b/.github/workflows/extbuild.yml @@ -34,7 +34,7 @@ jobs: path: ~/ESMF key: ${{ runner.os }}-${{ env.ESMF_VERSION }}-ESMF - id: load-env - run: sudo apt-get install gfortran wget openmpi-bin netcdf-bin libopenmpi-dev netcdf-dev + run: sudo apt-get install gfortran wget openmpi-bin netcdf-bin libopenmpi-dev libnetcdf-dev - id: build-ESMF if: steps.cache-esmf.outputs.cache-hit != 'true' run: |