From 1f02ca36d889aea7384be1eff74fbc9efd893fd5 Mon Sep 17 00:00:00 2001 From: eric <1176427+EricWF@users.noreply.github.com> Date: Tue, 28 Nov 2023 16:58:01 -0500 Subject: [PATCH 1/4] changes again --- .github/workflows/callable.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/callable.yaml b/.github/workflows/callable.yaml index 461e90b..0f884c2 100644 --- a/.github/workflows/callable.yaml +++ b/.github/workflows/callable.yaml @@ -44,7 +44,7 @@ env: jobs: stage1: - if: ${{ contains(inputs.run_stages, 1) }} + if: contains(inputs.run_stages, 1) runs-on: rizzo-runner-64-set continue-on-error: false strategy: @@ -85,7 +85,7 @@ jobs: **/CMakeOutput.log **/crash_diagnostics/* stage2: - if: ${{ contains(github.event.inputs.run_stages, 2) }} + if: contains(github.event.inputs.run_stages, 2) runs-on: rizzo-runner-64-set needs: [ stage1 ] continue-on-error: false @@ -134,7 +134,7 @@ jobs: **/CMakeOutput.log **/crash_diagnostics/* stage3: - if: ${{ contains(github.event.inputs.run_stages, 3) }} + if: contains(github.event.inputs.run_stages, 3) needs: [ stage1, stage2 ] continue-on-error: false strategy: From 7624b58fe767032519b4296ed55372cb6fb8a922 Mon Sep 17 00:00:00 2001 From: eric <1176427+EricWF@users.noreply.github.com> Date: Tue, 28 Nov 2023 16:59:15 -0500 Subject: [PATCH 2/4] changes again --- .github/workflows/callable.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/callable.yaml b/.github/workflows/callable.yaml index 0f884c2..84f66e2 100644 --- a/.github/workflows/callable.yaml +++ b/.github/workflows/callable.yaml @@ -12,7 +12,7 @@ # under the assumption that if the "smoke tests" fail, then the other configurations will likely fail in the same way. # However, stage 3 does not fail fast, as it's more likely that any one job failing is a flake or a configuration-specific # -name: Build and Test libc++ + on: workflow_dispatch: inputs: From 6437137a9e845cddaaba754c80a9cf2bf8ca56e0 Mon Sep 17 00:00:00 2001 From: eric <1176427+EricWF@users.noreply.github.com> Date: Tue, 28 Nov 2023 19:20:36 -0500 Subject: [PATCH 3/4] changes --- .github/workflows/callable.yaml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.github/workflows/callable.yaml b/.github/workflows/callable.yaml index 84f66e2..f297a79 100644 --- a/.github/workflows/callable.yaml +++ b/.github/workflows/callable.yaml @@ -19,7 +19,6 @@ on: llvm_ref: description: 'llvm ref' required: true - type: str run_stages: description: 'Stages to run' required: true @@ -29,18 +28,6 @@ on: -env: - CMAKE: "/opt/bin/cmake" - # LLVM POST-BRANCH bump version - # LLVM POST-BRANCH add compiler test for ToT - 1, e.g. "Clang 17" - # LLVM RELEASE bump remove compiler ToT - 3, e.g. "Clang 15" - LLVM_HEAD_VERSION: "18" # Used compiler, update POST-BRANCH. - LLVM_PREVIOUS_VERSION: "17" - LLVM_OLDEST_VERSION: "16" - GCC_STABLE_VERSION: "13" - LLVM_SYMBOLIZER_PATH: "/usr/bin/llvm-symbolizer-18" - CLANG_CRASH_DIAGNOSTICS_DIR: "crash_diagnostics" - jobs: stage1: From ac9233c9e38e55817ebf273dddb1b73d06f36391 Mon Sep 17 00:00:00 2001 From: eric <1176427+EricWF@users.noreply.github.com> Date: Tue, 28 Nov 2023 19:25:09 -0500 Subject: [PATCH 4/4] changes --- .github/workflows/callable.yaml | 68 +++++++++++++++++++++------------ 1 file changed, 44 insertions(+), 24 deletions(-) diff --git a/.github/workflows/callable.yaml b/.github/workflows/callable.yaml index f297a79..3e08110 100644 --- a/.github/workflows/callable.yaml +++ b/.github/workflows/callable.yaml @@ -19,19 +19,40 @@ on: llvm_ref: description: 'llvm ref' required: true - run_stages: + type: string + run_stage1: description: 'Stages to run' - required: true - default: [1, 2, 3] + required: false + default: true + run_stage2: + description: 'stage 2 run' + required: false + default: true + run_stage3: + description: 'stage 3 run' + required: false + default: false + +env: + CMAKE: "/opt/bin/cmake" + # LLVM POST-BRANCH bump version + # LLVM POST-BRANCH add compiler test for ToT - 1, e.g. "Clang 17" + # LLVM RELEASE bump remove compiler ToT - 3, e.g. "Clang 15" + LLVM_HEAD_VERSION: "18" # Used compiler, update POST-BRANCH. + LLVM_PREVIOUS_VERSION: "17" + LLVM_OLDEST_VERSION: "16" + GCC_STABLE_VERSION: "13" + LLVM_SYMBOLIZER_PATH: "/usr/bin/llvm-symbolizer-18" + CLANG_CRASH_DIAGNOSTICS_DIR: "crash_diagnostics" jobs: stage1: - if: contains(inputs.run_stages, 1) + if: ${{ inputs.run_stage1 }} runs-on: rizzo-runner-64-set continue-on-error: false strategy: @@ -42,7 +63,7 @@ jobs: 'generic-cxx26', 'generic-modules' ] - cc: [ 'clang-18' ] + cc: [ 'clang-18' ] cxx: [ 'clang++-18' ] clang_tidy: [ 'ON' ] include: @@ -72,7 +93,7 @@ jobs: **/CMakeOutput.log **/crash_diagnostics/* stage2: - if: contains(github.event.inputs.run_stages, 2) + if: ${{ inputs.run_stage1 }} && ${{ inputs.run_stage2 }} runs-on: rizzo-runner-64-set needs: [ stage1 ] continue-on-error: false @@ -121,7 +142,7 @@ jobs: **/CMakeOutput.log **/crash_diagnostics/* stage3: - if: contains(github.event.inputs.run_stages, 3) + if: inputs.run_stage3 needs: [ stage1, stage2 ] continue-on-error: false strategy: @@ -151,22 +172,22 @@ jobs: machine: [ 'libcxx-runners-8' ] std_modules: [ 'OFF' ] include: - - config: 'generic-cxx26' - machine: libcxx-runners-8 - std_modules: 'ON' - - config: 'generic-asan' - machine: libcxx-runners-8 - std_modules: 'OFF' - - config: 'generic-tsan' - machine: libcxx-runners-8 - std_modules: 'OFF' - - config: 'generic-ubsan' - machine: libcxx-runners-8 - std_modules: 'OFF' - # Use a larger machine for MSAN to avoid timeout and memory allocation issues. - - config: 'generic-msan' - machine: libcxx-runners-32 - std_modules: 'OFF' + - config: 'generic-cxx26' + machine: libcxx-runners-8 + std_modules: 'ON' + - config: 'generic-asan' + machine: libcxx-runners-8 + std_modules: 'OFF' + - config: 'generic-tsan' + machine: libcxx-runners-8 + std_modules: 'OFF' + - config: 'generic-ubsan' + machine: libcxx-runners-8 + std_modules: 'OFF' + # Use a larger machine for MSAN to avoid timeout and memory allocation issues. + - config: 'generic-msan' + machine: libcxx-runners-32 + std_modules: 'OFF' runs-on: rizzo-runner-64-set steps: - uses: actions/checkout@v4 @@ -187,4 +208,3 @@ jobs: **/CMakeError.log **/CMakeOutput.log **/crash_diagnostics/* -