From 1a87edd849bce69e257a4dbcbce7c63a48e41d3a Mon Sep 17 00:00:00 2001 From: Aaron Jomy Date: Mon, 9 Jun 2025 21:40:51 +0200 Subject: [PATCH 1/2] [ci] Set names for reusable actions --- .github/workflows/MacOS-arm.yml | 10 ++++++---- .github/workflows/MacOS.yml | 10 ++++++---- .github/workflows/Ubuntu-arm.yml | 10 +++++++--- .github/workflows/Ubuntu.yml | 10 +++++++--- .github/workflows/Windows-arm.yml | 6 ++++-- .github/workflows/Windows.yml | 6 ++++-- 6 files changed, 34 insertions(+), 18 deletions(-) diff --git a/.github/workflows/MacOS-arm.yml b/.github/workflows/MacOS-arm.yml index 97c525906..95998f27f 100644 --- a/.github/workflows/MacOS-arm.yml +++ b/.github/workflows/MacOS-arm.yml @@ -164,8 +164,8 @@ jobs: brew install gnu-sed pip install distro pytest - - - uses: ./.github/actions/Build_LLVM + - name: Build LLVM and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} + uses: ./.github/actions/Build_LLVM with: cache-hit: ${{ steps.cache.outputs.cache-hit }} @@ -178,9 +178,11 @@ jobs: ${{ matrix.cling=='On' && 'cling' || '' }} key: ${{ steps.cache.outputs.cache-primary-key }} - - uses: ./.github/actions/Build_and_Test_CppInterOp + - name: Build and test CppInterOp + uses: ./.github/actions/Build_and_Test_CppInterOp - - uses: ./.github/actions/Build_and_Test_cppyy + - name: Build and test cppyy + uses: ./.github/actions/Build_and_Test_cppyy - name: Show debug info if: ${{ failure() }} diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml index a06288c4c..99199dcf8 100644 --- a/.github/workflows/MacOS.yml +++ b/.github/workflows/MacOS.yml @@ -149,8 +149,8 @@ jobs: brew install gnu-sed pip install distro pytest - - - uses: ./.github/actions/Build_LLVM + - name: Build LLVM and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} + uses: ./.github/actions/Build_LLVM with: cache-hit: ${{ steps.cache.outputs.cache-hit }} @@ -163,9 +163,11 @@ jobs: ${{ matrix.cling=='On' && 'cling' || '' }} key: ${{ steps.cache.outputs.cache-primary-key }} - - uses: ./.github/actions/Build_and_Test_CppInterOp + - name: Build and test CppInterOp + uses: ./.github/actions/Build_and_Test_CppInterOp - - uses: ./.github/actions/Build_and_Test_cppyy + - name: Build and test cppyy + uses: ./.github/actions/Build_and_Test_cppyy - name: Show debug info if: ${{ failure() }} diff --git a/.github/workflows/Ubuntu-arm.yml b/.github/workflows/Ubuntu-arm.yml index 580ff5ea6..72ff9c398 100644 --- a/.github/workflows/Ubuntu-arm.yml +++ b/.github/workflows/Ubuntu-arm.yml @@ -163,7 +163,9 @@ jobs: sudo apt install libeigen3-dev sudo apt install libboost-all-dev - - uses: ./.github/actions/Build_LLVM + + - name: Build LLVM and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} + uses: ./.github/actions/Build_LLVM with: cache-hit: ${{ steps.cache.outputs.cache-hit }} @@ -183,7 +185,8 @@ jobs: echo "CODE_COVERAGE=1" >> $GITHUB_ENV echo "BUILD_TYPE=Debug" >> $GITHUB_ENV - - uses: ./.github/actions/Build_and_Test_CppInterOp + - name: Build and test CppInterOp + uses: ./.github/actions/Build_and_Test_CppInterOp - name: Prepare code coverage report if: ${{ success() && (matrix.coverage == true) }} @@ -205,7 +208,8 @@ jobs: verbose: true token: ${{ secrets.CODECOV_TOKEN }} - - uses: ./.github/actions/Build_and_Test_cppyy + - name: Build and test cppyy + uses: ./.github/actions/Build_and_Test_cppyy - name: Show debug info if: ${{ failure() }} diff --git a/.github/workflows/Ubuntu.yml b/.github/workflows/Ubuntu.yml index afcffe818..fb85e55f5 100644 --- a/.github/workflows/Ubuntu.yml +++ b/.github/workflows/Ubuntu.yml @@ -152,7 +152,9 @@ jobs: # Install libraries used by the cppyy test suite sudo apt install libeigen3-dev sudo apt install libboost-all-dev - - uses: ./.github/actions/Build_LLVM + + - name: Build LLVM and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} + uses: ./.github/actions/Build_LLVM with: cache-hit: ${{ steps.cache.outputs.cache-hit }} @@ -172,7 +174,8 @@ jobs: echo "CODE_COVERAGE=1" >> $GITHUB_ENV echo "BUILD_TYPE=Debug" >> $GITHUB_ENV - - uses: ./.github/actions/Build_and_Test_CppInterOp + - name: Build and test CppInterOp + uses: ./.github/actions/Build_and_Test_CppInterOp - name: Prepare code coverage report if: ${{ success() && (matrix.coverage == true) }} @@ -194,7 +197,8 @@ jobs: verbose: true token: ${{ secrets.CODECOV_TOKEN }} - - uses: ./.github/actions/Build_and_Test_cppyy + - name: Build and test cppyy + uses: ./.github/actions/Build_and_Test_cppyy - name: Show debug info if: ${{ failure() }} diff --git a/.github/workflows/Windows-arm.yml b/.github/workflows/Windows-arm.yml index 0a17ff458..f8b1b1f70 100644 --- a/.github/workflows/Windows-arm.yml +++ b/.github/workflows/Windows-arm.yml @@ -117,7 +117,8 @@ jobs: choco install findutils $env:PATH="C:\Program Files (x86)\GnuWin32\bin;$env:PATH" - - uses: ./.github/actions/Build_LLVM + - name: Build LLVM and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} + uses: ./.github/actions/Build_LLVM with: cache-hit: ${{ steps.cache.outputs.cache-hit }} @@ -130,7 +131,8 @@ jobs: ${{ matrix.cling=='On' && 'cling' || '' }} key: ${{ steps.cache.outputs.cache-primary-key }} - - uses: ./.github/actions/Build_and_Test_CppInterOp + - name: Build and test CppInterOp + uses: ./.github/actions/Build_and_Test_CppInterOp - name: Setup tmate session if: ${{ failure() && runner.debug }} diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml index d66e8f462..a796c9a91 100644 --- a/.github/workflows/Windows.yml +++ b/.github/workflows/Windows.yml @@ -117,7 +117,8 @@ jobs: choco install findutils $env:PATH="C:\Program Files (x86)\GnuWin32\bin;$env:PATH" - - uses: ./.github/actions/Build_LLVM + - name: Build LLVM and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} + uses: ./.github/actions/Build_LLVM with: cache-hit: ${{ steps.cache.outputs.cache-hit }} @@ -130,7 +131,8 @@ jobs: ${{ matrix.cling=='On' && 'cling' || '' }} key: ${{ steps.cache.outputs.cache-primary-key }} - - uses: ./.github/actions/Build_and_Test_CppInterOp + - name: Build and test CppInterOp + uses: ./.github/actions/Build_and_Test_CppInterOp - name: Setup tmate session if: ${{ failure() && runner.debug }} From 8b0887ed966badac4be8b0ffc3345526a1ba73c1 Mon Sep 17 00:00:00 2001 From: Aaron Jomy Date: Tue, 10 Jun 2025 14:03:20 +0200 Subject: [PATCH 2/2] [ci] add llvm versions to reusable action names --- .github/workflows/MacOS-arm.yml | 6 +++--- .github/workflows/MacOS.yml | 6 +++--- .github/workflows/Ubuntu-arm.yml | 6 +++--- .github/workflows/Ubuntu.yml | 6 +++--- .github/workflows/Windows-arm.yml | 6 +++--- .github/workflows/Windows.yml | 6 +++--- .github/workflows/deploy-pages.yml | 2 +- .github/workflows/emscripten.yml | 6 +++--- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/MacOS-arm.yml b/.github/workflows/MacOS-arm.yml index 95998f27f..fc52ff285 100644 --- a/.github/workflows/MacOS-arm.yml +++ b/.github/workflows/MacOS-arm.yml @@ -102,7 +102,7 @@ jobs: echo "CLING_HASH=$CLING_HASH" >> $GITHUB_ENV echo "LLVM_HASH=$LLVM_HASH" >> $GITHUB_ENV - - name: Restore Cache LLVM/Clang runtime build directory + - name: Restore cached LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} build uses: actions/cache/restore@v4 id: cache with: @@ -164,12 +164,12 @@ jobs: brew install gnu-sed pip install distro pytest - - name: Build LLVM and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} + - name: Build LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} uses: ./.github/actions/Build_LLVM with: cache-hit: ${{ steps.cache.outputs.cache-hit }} - - name: Save Cache LLVM/Clang runtime build directory + - name: Cache LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} build uses: actions/cache/save@v4 if: ${{ steps.cache.outputs.cache-hit != 'true' }} with: diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml index 99199dcf8..0e4abe796 100644 --- a/.github/workflows/MacOS.yml +++ b/.github/workflows/MacOS.yml @@ -101,7 +101,7 @@ jobs: echo "CLING_HASH=$CLING_HASH" >> $GITHUB_ENV echo "LLVM_HASH=$LLVM_HASH" >> $GITHUB_ENV - - name: Restore Cache LLVM/Clang runtime build directory + - name: Restore cached LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} build uses: actions/cache/restore@v4 id: cache with: @@ -149,12 +149,12 @@ jobs: brew install gnu-sed pip install distro pytest - - name: Build LLVM and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} + - name: Build LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} uses: ./.github/actions/Build_LLVM with: cache-hit: ${{ steps.cache.outputs.cache-hit }} - - name: Save Cache LLVM/Clang runtime build directory + - name: Cache LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} build uses: actions/cache/save@v4 if: ${{ steps.cache.outputs.cache-hit != 'true' }} with: diff --git a/.github/workflows/Ubuntu-arm.yml b/.github/workflows/Ubuntu-arm.yml index 72ff9c398..8ab0c6e3f 100644 --- a/.github/workflows/Ubuntu-arm.yml +++ b/.github/workflows/Ubuntu-arm.yml @@ -111,7 +111,7 @@ jobs: echo "CLING_HASH=$CLING_HASH" >> $GITHUB_ENV echo "LLVM_HASH=$LLVM_HASH" >> $GITHUB_ENV - - name: Restore Cache LLVM/Clang runtime build directory + - name: Restore cached LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} build uses: actions/cache/restore@v4 id: cache with: @@ -164,12 +164,12 @@ jobs: sudo apt install libboost-all-dev - - name: Build LLVM and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} + - name: Build LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} uses: ./.github/actions/Build_LLVM with: cache-hit: ${{ steps.cache.outputs.cache-hit }} - - name: Save Cache LLVM/Clang runtime build directory + - name: Cache LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} build uses: actions/cache/save@v4 if: ${{ steps.cache.outputs.cache-hit != 'true' }} with: diff --git a/.github/workflows/Ubuntu.yml b/.github/workflows/Ubuntu.yml index fb85e55f5..07c7040f7 100644 --- a/.github/workflows/Ubuntu.yml +++ b/.github/workflows/Ubuntu.yml @@ -102,7 +102,7 @@ jobs: echo "CLING_HASH=$CLING_HASH" >> $GITHUB_ENV echo "LLVM_HASH=$LLVM_HASH" >> $GITHUB_ENV - - name: Restore Cache LLVM/Clang runtime build directory + - name: Restore cached LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} build uses: actions/cache/restore@v4 id: cache with: @@ -153,12 +153,12 @@ jobs: sudo apt install libeigen3-dev sudo apt install libboost-all-dev - - name: Build LLVM and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} + - name: Build LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} uses: ./.github/actions/Build_LLVM with: cache-hit: ${{ steps.cache.outputs.cache-hit }} - - name: Save Cache LLVM/Clang runtime build directory + - name: Cache LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} build uses: actions/cache/save@v4 if: ${{ steps.cache.outputs.cache-hit != 'true' }} with: diff --git a/.github/workflows/Windows-arm.yml b/.github/workflows/Windows-arm.yml index f8b1b1f70..3198abd48 100644 --- a/.github/workflows/Windows-arm.yml +++ b/.github/workflows/Windows-arm.yml @@ -74,7 +74,7 @@ jobs: echo "CLING_HASH=$env:CLING_HASH" >> $GITHUB_ENV echo "LLVM_HASH=$env:LLVM_HASH" >> $GITHUB_ENV - - name: Restore Cache LLVM/Clang runtime build directory + - name: Restore cached LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} build uses: actions/cache/restore@v4 id: cache with: @@ -117,12 +117,12 @@ jobs: choco install findutils $env:PATH="C:\Program Files (x86)\GnuWin32\bin;$env:PATH" - - name: Build LLVM and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} + - name: Build LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} uses: ./.github/actions/Build_LLVM with: cache-hit: ${{ steps.cache.outputs.cache-hit }} - - name: Save Cache LLVM/Clang runtime build directory + - name: Cache LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} build uses: actions/cache/save@v4 if: ${{ steps.cache.outputs.cache-hit != 'true' }} with: diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml index a796c9a91..d10b05afa 100644 --- a/.github/workflows/Windows.yml +++ b/.github/workflows/Windows.yml @@ -74,7 +74,7 @@ jobs: echo "CLING_HASH=$env:CLING_HASH" >> $GITHUB_ENV echo "LLVM_HASH=$env:LLVM_HASH" >> $GITHUB_ENV - - name: Restore Cache LLVM/Clang runtime build directory + - name: Restore cached LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} build uses: actions/cache/restore@v4 id: cache with: @@ -117,12 +117,12 @@ jobs: choco install findutils $env:PATH="C:\Program Files (x86)\GnuWin32\bin;$env:PATH" - - name: Build LLVM and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} + - name: Build LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} uses: ./.github/actions/Build_LLVM with: cache-hit: ${{ steps.cache.outputs.cache-hit }} - - name: Save Cache LLVM/Clang runtime build directory + - name: Cache LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} build uses: actions/cache/save@v4 if: ${{ steps.cache.outputs.cache-hit != 'true' }} with: diff --git a/.github/workflows/deploy-pages.yml b/.github/workflows/deploy-pages.yml index c4aecd0fd..354a1f289 100644 --- a/.github/workflows/deploy-pages.yml +++ b/.github/workflows/deploy-pages.yml @@ -79,7 +79,7 @@ jobs: cd emsdk ./emsdk install ${{ matrix.emsdk_ver }} - - name: Restore Cache LLVM/Clang runtime build directory + - name: Restore cached LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} build uses: actions/cache/restore@v4 id: cache with: diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml index 45ee51d6d..24c925194 100644 --- a/.github/workflows/emscripten.yml +++ b/.github/workflows/emscripten.yml @@ -137,7 +137,7 @@ jobs: echo "CLING_HASH=$env:CLING_HASH" >> $GITHUB_ENV echo "LLVM_HASH=$env:LLVM_HASH" >> $GITHUB_ENV - - name: Restore Cache LLVM/Clang runtime build directory (Unix like systems emscripten) + - name: Restore cached LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} build (Unix like systems emscripten) uses: actions/cache/restore@v4 id: cache with: @@ -415,7 +415,7 @@ jobs: cd ..\.. } - - name: Save Cache LLVM/Clang runtime build directory + - name: Cache LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} build uses: actions/cache/save@v4 if: ${{ steps.cache.outputs.cache-hit != 'true' }} with: @@ -540,7 +540,7 @@ jobs: cd emsdk ./emsdk install ${{ matrix.emsdk_ver }} - - name: Restore Cache LLVM/Clang runtime build directory + - name: Restore cached LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} build uses: actions/cache/restore@v4 id: cache with: