diff --git a/.github/actions/autotools/build/action.yml b/.github/actions/autotools/build/action.yml index 5ea44c7a..cf8dbd93 100644 --- a/.github/actions/autotools/build/action.yml +++ b/.github/actions/autotools/build/action.yml @@ -6,6 +6,10 @@ runs: run: ./autogen.sh shell: bash --noprofile --norc -euxo pipefail {0} + - name: Create `build` directory link + run: ln -s . build + shell: bash --noprofile --norc -euxo pipefail {0} + - name: Run `./configure` run: ./configure shell: bash --noprofile --norc -euxo pipefail {0} diff --git a/.github/actions/cmake/package/action.yml b/.github/actions/cmake/package/action.yml index 74e0391e..3ad6288f 100644 --- a/.github/actions/cmake/package/action.yml +++ b/.github/actions/cmake/package/action.yml @@ -4,7 +4,7 @@ runs: steps: - name: Set `CPACK_PACKAGE_FILE_NAME` run: | - echo "CPACK_PACKAGE_FILE_NAME=mod_tile-${GITHUB_SHA}-$(echo ${{ matrix.image || matrix.os || matrix.box_generic || github.job }}-${{ matrix.compiler }} | sed 's/[^0-9a-zA-Z-]/_/g')" >> ${GITHUB_ENV} + echo "CPACK_PACKAGE_FILE_NAME=mod_tile-${GITHUB_SHA}-$(echo ${{ matrix.image || matrix.os || matrix.box_generic || github.job }}-${{ matrix.build_system }}-${{ matrix.compiler }} | sed 's/[^0-9a-zA-Z-]/_/g')" >> ${GITHUB_ENV} shell: bash --noprofile --norc -euxo pipefail {0} - name: Set `CPACK_OPTIONS` diff --git a/.github/actions/cmake/test/action.yml b/.github/actions/cmake/test/action.yml index c8260bd8..2d2be7c6 100644 --- a/.github/actions/cmake/test/action.yml +++ b/.github/actions/cmake/test/action.yml @@ -15,7 +15,7 @@ runs: - name: Set `TEST_ARTIFACT_NAME` run: | - echo "TEST_ARTIFACT_NAME=$(echo ${{ matrix.image || matrix.os || matrix.box_generic || github.job }}-${{ matrix.compiler }} | sed 's/[^0-9a-zA-Z-]/_/g')" >> ${GITHUB_ENV} + echo "TEST_ARTIFACT_NAME=$(echo ${{ matrix.image || matrix.os || matrix.box_generic || github.job }}-${{ matrix.build_system }}-${{ matrix.compiler }} | sed 's/[^0-9a-zA-Z-]/_/g')" >> ${GITHUB_ENV} shell: bash --noprofile --norc -euxo pipefail {0} if: failure() diff --git a/.github/actions/coverage/action.yml b/.github/actions/coverage/action.yml index cf7aee9f..820f1fca 100644 --- a/.github/actions/coverage/action.yml +++ b/.github/actions/coverage/action.yml @@ -47,7 +47,7 @@ runs: - name: Set `COVERAGE_ARTIFACT_NAME` run: | - echo "COVERAGE_ARTIFACT_NAME=$(echo ${{ matrix.image || matrix.os || matrix.box_generic || github.job }}-${{ matrix.compiler }} | sed 's/[^0-9a-zA-Z-]/_/g')" >> ${GITHUB_ENV} + echo "COVERAGE_ARTIFACT_NAME=$(echo ${{ matrix.image || matrix.os || matrix.box_generic || github.job }}-${{ matrix.build_system }}-${{ matrix.compiler }} | sed 's/[^0-9a-zA-Z-]/_/g')" >> ${GITHUB_ENV} shell: bash --noprofile --norc -euxo pipefail {0} - name: Upload `mod_tile` coverage artifacts diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 3e92c723..19c13acb 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -85,7 +85,6 @@ jobs: - name: Process & Report `mod_tile` coverage results uses: ./.github/actions/coverage if: | - matrix.build_system == 'CMake' && matrix.compiler != 'LLVM' && !startsWith(matrix.image, 'opensuse/') && !matrix.experimental @@ -139,7 +138,6 @@ jobs: - name: Process & Report `mod_tile` coverage results uses: ./.github/actions/coverage - if: matrix.build_system == 'CMake' - name: Package `mod_tile` uses: ./.github/actions/cmake/package @@ -206,7 +204,6 @@ jobs: with: genhtml-extra-options: --ignore-errors inconsistent --ignore-errors unmapped lcov-extra-options: --ignore-errors gcov --ignore-errors inconsistent - if: matrix.build_system == 'CMake' - name: Package `mod_tile` uses: ./.github/actions/cmake/package