diff --git a/.github/workflows/common-workflow.yml b/.github/workflows/common-workflow.yml index 8962450b0..3b35c3fdb 100644 --- a/.github/workflows/common-workflow.yml +++ b/.github/workflows/common-workflow.yml @@ -12,7 +12,7 @@ on: build_command: required: true type: string - ext_install_command: + ext_pkg_build_command: required: true type: string test_cases: @@ -112,7 +112,12 @@ jobs: run: make -j4 install - name: Compress ISSM artifact - run: tar --exclude='./externalpackages/petsc/src' -cvf ISSM_artifact-${{ runner.os }}-${{ inputs.build_type }}.tar -C ${{ env.ISSM_DIR }}/ . + run: | + rm -rf .git + find externalpackages -maxdepth 1 -name src -exec rm -rf {} \; + find externalpackages -maxdepth 1 -name *tar.gz -exec rm -rf {} \; + find externalpackages -maxdepth 1 -name *zip -exec rm -rf {} \; + tar --exclude='./externalpackages/petsc/src' -cvf ISSM_artifact-${{ runner.os }}-${{ inputs.build_type }}.tar -C ${{ env.ISSM_DIR }}/ . - name: Upload ISSM artifact uses: actions/upload-artifact@v4 diff --git a/.github/workflows/ubuntu-basic.yml b/.github/workflows/ubuntu-basic.yml index 35d766f3b..831e3bbaf 100644 --- a/.github/workflows/ubuntu-basic.yml +++ b/.github/workflows/ubuntu-basic.yml @@ -57,7 +57,7 @@ jobs: --with-triangle-dir="${ISSM_DIR}/externalpackages/triangle/install" \ --with-semic-dir="${ISSM_DIR}/externalpackages/semic/install" \ --with-m1qn3-dir="${ISSM_DIR}/externalpackages/m1qn3/install" - ext_install_command: | + ext_pkg_build_command: | cd $ISSM_DIR/externalpackages/triangle && ./install-linux.sh cd $ISSM_DIR/externalpackages/m1qn3 && ./install-linux.sh cd $ISSM_DIR/externalpackages/petsc && ./install-3.22-linux.sh diff --git a/.github/workflows/ubuntu-codipack.yml b/.github/workflows/ubuntu-codipack.yml index ddf0c5bde..0a1fdae22 100644 --- a/.github/workflows/ubuntu-codipack.yml +++ b/.github/workflows/ubuntu-codipack.yml @@ -62,7 +62,7 @@ jobs: --with-m1qn3-dir="${ISSM_DIR}/externalpackages/m1qn3/install" \ --with-medipack-dir="${ISSM_DIR}/externalpackages/medipack/install" \ --with-codipack-dir="${ISSM_DIR}/externalpackages/codipack/install" - ext_install_command: | + ext_pkg_build_command: | cd $ISSM_DIR/externalpackages/triangle && ./install-linux.sh cd $ISSM_DIR/externalpackages/m1qn3 && ./install-linux.sh cd $ISSM_DIR/externalpackages/petsc && ./install-3.22-linux.sh diff --git a/.github/workflows/ubuntu-python.yml b/.github/workflows/ubuntu-python.yml index c48432f50..e68758489 100644 --- a/.github/workflows/ubuntu-python.yml +++ b/.github/workflows/ubuntu-python.yml @@ -61,7 +61,7 @@ jobs: --with-triangle-dir="${ISSM_DIR}/externalpackages/triangle/install" \ --with-semic-dir="${ISSM_DIR}/externalpackages/semic/install" \ --with-m1qn3-dir="${ISSM_DIR}/externalpackages/m1qn3/install" - ext_install_command: | + ext_pkg_build_command: | cd $ISSM_DIR/externalpackages/triangle && ./install-linux.sh cd $ISSM_DIR/externalpackages/m1qn3 && ./install-linux.sh cd $ISSM_DIR/externalpackages/petsc && ./install-3.22-linux.sh