diff --git a/.github/actions/build-cmake-preset/action.yml b/.github/actions/build-cmake-preset/action.yml index fc20cac78..4af1d437f 100644 --- a/.github/actions/build-cmake-preset/action.yml +++ b/.github/actions/build-cmake-preset/action.yml @@ -13,19 +13,6 @@ inputs: cmake-args: description: "Additional CMake arguments" required: false - do-package-symbols: - description: "In Debug builds, split symbols and provide a zip package" - required: false - type: boolean - do-package: - description: "Run `cmake --target package` and upload artifact" - required: false - type: boolean - retention-days: - description: "How long we keep the artifacts" - required: false - type: number - default: 14 run-tests: description: "Run tests" required: false @@ -62,6 +49,8 @@ outputs: value: "${{ steps.cmake-package.outputs.symbols-package-name }}" runs: + env: + - RETENTION_DAYS: 2 using: composite steps: @@ -112,10 +101,9 @@ runs: with: name: "${{ inputs.testlog-name }}-test-results" path: '_build/**/*gtestresults.xml' - retention-days: ${{ inputs.retention-days }} + retention-days: ${{ env.RETENTION_DAYS }} - name: create cmake package for ${{ inputs.preset-name }} - if: ${{ inputs.do-package == 'true' }} id: cmake-package run: | cmake --build --preset ${{ inputs.preset-name }} --target package @@ -127,19 +115,9 @@ runs: shell: bash - name: upload package ${{ inputs.preset-name }} - if: ${{ inputs.do-package == 'true' }} uses: actions/upload-artifact@v4 with: name: ${{ steps.cmake-package.outputs.package-name }} path: ${{ steps.cmake-package.outputs.package-path }} if-no-files-found: 'error' - retention-days: ${{ inputs.retention-days }} - - - name: upload symbols package ${{ inputs.preset-name }} - if: ${{ inputs.do-package-symbols == 'true' }} - uses: actions/upload-artifact@v4 - with: - name: ${{ steps.cmake-package.outputs.symbols-package-name }} - path: ${{ steps.cmake-package.outputs.symbols-package-path}} - if-no-files-found: 'error' - retention-days: ${{ inputs.retention-days }} + retention-days: ${{ env.RETENTION_DAYS }} diff --git a/.github/workflows/build-linux-arm64.yml b/.github/workflows/build-linux-arm64.yml index 26ae5f8b7..76a9627a8 100644 --- a/.github/workflows/build-linux-arm64.yml +++ b/.github/workflows/build-linux-arm64.yml @@ -2,18 +2,6 @@ name: 'Linux Release Builds For ARM64' on: workflow_call: inputs: - do_package: - required: false - type: boolean - default: false - do_package_symbols: - required: false - type: boolean - default: false - retention_days: - required: false - type: number - default: 14 run_build: required: true type: boolean @@ -38,8 +26,6 @@ jobs: - uses: ./.github/actions/build-cmake-preset with: preset-name: linux-release - do-package: ${{ inputs.do_package }} - retention-days: ${{ inputs.retention_days }} cmake-args: "-DCMAKE_C_COMPILER=${{ matrix.toolchain.cc }} \ -DCMAKE_CXX_COMPILER=${{ matrix.toolchain.cxx }}" testlog-name: ${{ github.job }} diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 91b5e8e53..1b3c2b6df 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -2,18 +2,6 @@ name: 'Linux Release Builds' on: workflow_call: inputs: - do_package: - required: false - type: boolean - default: false - do_package_symbols: - required: false - type: boolean - default: false - retention_days: - required: false - type: number - default: 14 run_build: required: true type: boolean @@ -40,8 +28,6 @@ jobs: - uses: ./.github/actions/build-cmake-preset with: preset-name: linux-release - do-package: ${{ inputs.do_package }} - retention-days: ${{ inputs.retention_days }} cmake-args: "-DCMAKE_C_COMPILER=${{ matrix.toolchain.cc }} \ -DCMAKE_CXX_COMPILER=${{ matrix.toolchain.cxx }}" testlog-name: "${{ github.job }}-${{ matrix.toolchain.cc }}" diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 79c6717d8..d84869270 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -2,19 +2,6 @@ name: macOS build on: workflow_call: - inputs: - do_package: - required: false - type: boolean - default: false - do_package_symbols: - required: false - type: boolean - default: false - retention_days: - required: false - type: number - default: 14 jobs: build-macos: @@ -29,7 +16,4 @@ jobs: - uses: ./.github/actions/build-cmake-preset with: preset-name: clang-release - do_package: ${{ inputs.do_package }} - do_package_symbols: ${{ inputs.do_package_symbols }} - retention_days: ${{ inputs.retention_days }} testlog-name: ${{ github.job }} diff --git a/.github/workflows/build-win.yml b/.github/workflows/build-win.yml index 3561ef880..eb420039c 100644 --- a/.github/workflows/build-win.yml +++ b/.github/workflows/build-win.yml @@ -11,10 +11,6 @@ on: required: false type: boolean default: false - retention_days: - required: false - type: number - default: 14 run_build: required: true type: boolean @@ -39,8 +35,6 @@ jobs: - uses: ./.github/actions/build-cmake-preset with: preset-name: vs141-x64-release - do-package: ${{ inputs.do_package }} - retention-days: ${{ inputs.retention_days }} build-arch: x64 testlog-name: ${{ github.job }} @@ -56,7 +50,5 @@ jobs: - uses: ./.github/actions/build-cmake-preset with: preset-name: vs141-x86-release - do-package: ${{ inputs.do_package }} - retention-days: ${{ inputs.retention_days }} build-arch: x86 testlog-name: ${{ github.job }} diff --git a/.github/workflows/linux-asan.yml b/.github/workflows/linux-asan.yml index d7a9580c5..a0451c883 100644 --- a/.github/workflows/linux-asan.yml +++ b/.github/workflows/linux-asan.yml @@ -22,7 +22,6 @@ jobs: - uses: ./.github/actions/build-cmake-preset with: preset-name: clang-relwithdebinfo - do-package: false cmake-args: "-D SILKIT_ENABLE_ASAN=ON -D SILKIT_BUILD_DASHBOARD=OFF \ -DCMAKE_C_COMPILER=clang-18 \ -DCMAKE_CXX_COMPILER=clang++-18" diff --git a/.github/workflows/linux-tsan.yml b/.github/workflows/linux-tsan.yml index 1fdc854c6..570940c87 100644 --- a/.github/workflows/linux-tsan.yml +++ b/.github/workflows/linux-tsan.yml @@ -24,7 +24,6 @@ jobs: - uses: ./.github/actions/build-cmake-preset with: preset-name: clang-relwithdebinfo - do-package: false cmake-args: "-D SILKIT_ENABLE_THREADSAN=ON -D SILKIT_BUILD_DASHBOARD=OFF \ -DCMAKE_C_COMPILER=clang-18 \ -DCMAKE_CXX_COMPILER=clang++-18" diff --git a/.github/workflows/linux-ubsan.yml b/.github/workflows/linux-ubsan.yml index 2563dbba2..515abc4ce 100644 --- a/.github/workflows/linux-ubsan.yml +++ b/.github/workflows/linux-ubsan.yml @@ -23,7 +23,6 @@ jobs: - uses: ./.github/actions/build-cmake-preset with: preset-name: clang-relwithdebinfo - do-package: false cmake-args: "-D SILKIT_ENABLE_UBSAN=ON -D SILKIT_BUILD_DASHBOARD=OFF \ -DCMAKE_C_COMPILER=clang-18 \ -DCMAKE_CXX_COMPILER=clang++-18" diff --git a/.github/workflows/sil-kit-ci.yml b/.github/workflows/sil-kit-ci.yml index 3c392e4d0..4b232704e 100644 --- a/.github/workflows/sil-kit-ci.yml +++ b/.github/workflows/sil-kit-ci.yml @@ -87,30 +87,22 @@ jobs: uses: ./.github/workflows/build-linux.yml needs: [check-licenses, check-run-builds, check-formatting] with: - do_package: ${{ github.event_name == 'push' && true || false }} - retention_days: ${{ github.event_name == 'push' && 90 || 14 }} run_build: ${{ needs.check-run-builds.outputs.run_builds == 'true' }} ubuntu-arm-release-builds: uses: ./.github/workflows/build-linux-arm64.yml needs: [check-licenses, check-run-builds, check-formatting] with: - do_package: ${{ github.event_name == 'push' && true || false }} - retention_days: ${{ github.event_name == 'push' && 90 || 14 }} run_build: ${{ needs.check-run-builds.outputs.run_builds == 'true' }} windows-release-builds: uses: ./.github/workflows/build-win.yml needs: [check-licenses, check-run-builds, check-formatting] with: - do_package: ${{ github.event_name == 'push' && true || false }} - retention_days: ${{ github.event_name == 'push' && 90 || 14 }} run_build: ${{ needs.check-run-builds.outputs.run_builds == 'true' }} mingw-release-builds: uses: ./.github/workflows/build-mingw64.yml needs: [check-licenses, check-run-builds, check-formatting] with: - do_package: ${{ github.event_name == 'push' && true || false }} - retention_days: ${{ github.event_name == 'push' && 90 || 14 }} run_build: ${{ needs.check-run-builds.outputs.run_builds == 'true' }}