From 380f6fed4b19b385a5eaf47e1f4b40fe34f02def Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 19 May 2023 09:55:20 -0600 Subject: [PATCH 1/5] update github to make cdeps ext build an action --- .github/actions/buildcdeps/action.yaml | 41 ++++++++++++++++++++++++++ .github/workflows/extbuild.yml | 15 ++++------ 2 files changed, 47 insertions(+), 9 deletions(-) create mode 100644 .github/actions/buildcdeps/action.yaml diff --git a/.github/actions/buildcdeps/action.yaml b/.github/actions/buildcdeps/action.yaml new file mode 100644 index 000000000..b02be9af4 --- /dev/null +++ b/.github/actions/buildcdeps/action.yaml @@ -0,0 +1,41 @@ +name: CDEPS build and cache +description: 'Build the CDEPS library' +inputs: + cdeps_version: + description: 'Tag in the CDEPS repository to use' + default: main + required: False + type: string + pio_path: + description: 'Path to the installed parallelio code root' + default: $HOME/pio + required: False + type: string + esmfmkfile: + description: 'Path to the installed ESMF library mkfile' + default: $HOME/ESMF/lib/libg/Linux.gfortran.64.openmpi.default/esmf.mk + required: False + type: string + src_root: + description: 'Path to cdeps source' + default: $GITHUB_WORKSPACE + required: False + type: string + install_prefix: + description: 'Install path of cdeps' + default: $HOME/cdeps + required: False + type: string +runs: + using: composite + steps: + - id : Build-CDEPS + shell: bash + run: | + mkdir build-cdeps + pushd build-cdeps + export ESMFMKFILE=${{ inputs.esmfmkfile }} + export PIO=${{ inputs.pio_path }} + cmake -Wno-dev -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_Fortran_FLAGS="-DCPRGNU -g -Wall -ffree-form -ffree-line-length-none -fallow-argument-mismatch " -DWERROR=ON ${{ inputs.src_root }} + make VERBOSE=1 + popd diff --git a/.github/workflows/extbuild.yml b/.github/workflows/extbuild.yml index c3a54360e..08a92812f 100644 --- a/.github/workflows/extbuild.yml +++ b/.github/workflows/extbuild.yml @@ -93,12 +93,9 @@ jobs: pnetcdf_path: /usr parallelio_path: $HOME/pio - name: Build CDEPS - run: | - export ESMFMKFILE=$HOME/ESMF/lib/libg/Linux.gfortran.64.openmpi.default/esmf.mk - export PIO=$HOME/pio - export SRC_ROOT= - mkdir build-cdeps - pushd build-cdeps - cmake -Wno-dev -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_Fortran_FLAGS="-DCPRGNU -g -Wall -ffree-form -ffree-line-length-none -fallow-argument-mismatch " -DWERROR=ON ../ - make VERBOSE=1 - popd + uses: ESCOMP/CDEPS/.github/actions/buildcdeps + with: + esmfmkfile: $HOME/ESMF/lib/libg/Linux.gfortran.64.openmpi.default/esmf.mk + pio_path: $HOME/pio + src_root: $GITHUB_WORKSPACE + From 895f31bed41c7b7714d308facc2d7a5335410769 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 19 May 2023 10:28:57 -0600 Subject: [PATCH 2/5] debug action --- .github/actions/buildcdeps/action.yaml | 8 ++++++-- .github/workflows/extbuild.yml | 7 ++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/actions/buildcdeps/action.yaml b/.github/actions/buildcdeps/action.yaml index b02be9af4..237992127 100644 --- a/.github/actions/buildcdeps/action.yaml +++ b/.github/actions/buildcdeps/action.yaml @@ -21,6 +21,11 @@ inputs: default: $GITHUB_WORKSPACE required: False type: string + cmake_flags: + description: 'Extra flags for cmake command' + default: -Wno-dev + required: False + type: string install_prefix: description: 'Install path of cdeps' default: $HOME/cdeps @@ -36,6 +41,5 @@ runs: pushd build-cdeps export ESMFMKFILE=${{ inputs.esmfmkfile }} export PIO=${{ inputs.pio_path }} - cmake -Wno-dev -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_Fortran_FLAGS="-DCPRGNU -g -Wall -ffree-form -ffree-line-length-none -fallow-argument-mismatch " -DWERROR=ON ${{ inputs.src_root }} - make VERBOSE=1 + cmake ${{ inputs.cmake_flags }} ${{ inputs.src_root }} popd diff --git a/.github/workflows/extbuild.yml b/.github/workflows/extbuild.yml index 08a92812f..e75c7a73a 100644 --- a/.github/workflows/extbuild.yml +++ b/.github/workflows/extbuild.yml @@ -98,4 +98,9 @@ jobs: esmfmkfile: $HOME/ESMF/lib/libg/Linux.gfortran.64.openmpi.default/esmf.mk pio_path: $HOME/pio src_root: $GITHUB_WORKSPACE - + cmake_flags: " -Wno-dev -DCMAKE_BUILD_TYPE=DEBUG -DWERROR=ON -DCMAKE_Fortran_FLAGS=\"-DCPRGNU -g -Wall \ + -ffree-form -ffree-line-length-none -fallow-argument-mismatch \"" + - name: Test CDEPS + run: + cd build-cdeps + make VERBOSE=1 From cae6d80329b9e7562722c3b760c0ddd6176edeb5 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 19 May 2023 11:04:38 -0600 Subject: [PATCH 3/5] try again --- .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 e75c7a73a..cc945c998 100644 --- a/.github/workflows/extbuild.yml +++ b/.github/workflows/extbuild.yml @@ -93,7 +93,7 @@ jobs: pnetcdf_path: /usr parallelio_path: $HOME/pio - name: Build CDEPS - uses: ESCOMP/CDEPS/.github/actions/buildcdeps + uses: ./.github/actions/buildcdeps with: esmfmkfile: $HOME/ESMF/lib/libg/Linux.gfortran.64.openmpi.default/esmf.mk pio_path: $HOME/pio From 169c2801e2fc2e6789dd61f2e6f0c254377b7374 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 19 May 2023 11:28:22 -0600 Subject: [PATCH 4/5] fix run statement format --- .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 cc945c998..b2127bdc5 100644 --- a/.github/workflows/extbuild.yml +++ b/.github/workflows/extbuild.yml @@ -101,6 +101,6 @@ jobs: cmake_flags: " -Wno-dev -DCMAKE_BUILD_TYPE=DEBUG -DWERROR=ON -DCMAKE_Fortran_FLAGS=\"-DCPRGNU -g -Wall \ -ffree-form -ffree-line-length-none -fallow-argument-mismatch \"" - name: Test CDEPS - run: + run: | cd build-cdeps make VERBOSE=1 From 4a1f889add5392378f0a2722e487b108795ea1d1 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 19 May 2023 15:11:01 -0600 Subject: [PATCH 5/5] need to build in action to make it useable by other repos --- .github/actions/buildcdeps/action.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/buildcdeps/action.yaml b/.github/actions/buildcdeps/action.yaml index 237992127..9d775dd12 100644 --- a/.github/actions/buildcdeps/action.yaml +++ b/.github/actions/buildcdeps/action.yaml @@ -42,4 +42,5 @@ runs: export ESMFMKFILE=${{ inputs.esmfmkfile }} export PIO=${{ inputs.pio_path }} cmake ${{ inputs.cmake_flags }} ${{ inputs.src_root }} + make VERBOSE=1 popd