From 0c2cf964dd543f17ce03e9359f9134440a9fccff Mon Sep 17 00:00:00 2001 From: "Sean T. Allen" Date: Tue, 3 Dec 2024 04:08:41 +0000 Subject: [PATCH] Fix incorrect LLVM CI caching We were using libs rather than lib as the path to look up the libs CMake file. This meant that changes to it didn't result in the cache being properly busted. --- .github/workflows/nightlies.yml | 16 +++++----- .github/workflows/pr.yml | 36 +++++++++++------------ .github/workflows/release.yml | 16 +++++----- .github/workflows/stress-test-runtime.yml | 16 +++++----- .github/workflows/update-lib-cache.yml | 6 ++-- 5 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.github/workflows/nightlies.yml b/.github/workflows/nightlies.yml index 74b3d5683b..768a338937 100644 --- a/.github/workflows/nightlies.yml +++ b/.github/workflows/nightlies.yml @@ -46,7 +46,7 @@ jobs: uses: actions/cache/restore@v4 with: path: build/libs - key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: make libs build_flags=-j8 @@ -55,7 +55,7 @@ jobs: uses: actions/cache/save@v4 with: path: build/libs - key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Nightly run: bash .ci-scripts/x86-64-nightly.bash env: @@ -86,7 +86,7 @@ jobs: uses: actions/cache/restore@v4 with: path: build/libs - key: libs-x86-macos-13-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-x86-macos-13-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: make libs build_flags=-j8 @@ -95,7 +95,7 @@ jobs: uses: actions/cache/save@v4 with: path: build/libs - key: libs-x86-macos-13-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-x86-macos-13-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Install Cloudsmith run: pip3 install --upgrade cloudsmith-cli - name: Nightly @@ -128,7 +128,7 @@ jobs: uses: actions/cache/restore@v4 with: path: build/libs - key: libs-arm64-macos-14-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-arm64-macos-14-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: make libs build_flags=-j8 @@ -137,7 +137,7 @@ jobs: uses: actions/cache/save@v4 with: path: build/libs - key: libs-arm64-macos-14-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-arm64-macos-14-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Install Cloudsmith run: pip3 install --upgrade --break-system-packages cloudsmith-cli - name: Nightly @@ -177,7 +177,7 @@ jobs: uses: actions/cache/restore@v4 with: path: build/libs - key: libs-windows-2022-${{ hashFiles('make.ps1', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-windows-2022-${{ hashFiles('make.ps1', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: .\make.ps1 -Command libs @@ -186,7 +186,7 @@ jobs: uses: actions/cache/save@v4 with: path: build/libs - key: libs-windows-2022-${{ hashFiles('make.ps1', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-windows-2022-${{ hashFiles('make.ps1', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Configure run: .\make.ps1 -Command configure -Config Release -Prefix "build\install\release" -Version nightly - name: Build diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 782806b17b..dd80d41317 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -106,7 +106,7 @@ jobs: uses: actions/cache/restore@v4 with: path: build/libs - key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: make libs build_flags=-j8 @@ -115,7 +115,7 @@ jobs: uses: actions/cache/save@v4 with: path: build/libs - key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Debug Runtime run: | make configure arch=x86-64 config=debug @@ -151,7 +151,7 @@ jobs: uses: actions/cache/restore@v4 with: path: build/libs - key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: make libs build_flags=-j8 @@ -160,7 +160,7 @@ jobs: uses: actions/cache/save@v4 with: path: build/libs - key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Debug Runtime run: | make configure config=debug @@ -200,7 +200,7 @@ jobs: uses: actions/cache/restore@v4 with: path: build/libs - key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: make libs build_flags=-j8 @@ -209,7 +209,7 @@ jobs: uses: actions/cache/save@v4 with: path: build/libs - key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Debug Runtime run: | make configure config=debug @@ -249,7 +249,7 @@ jobs: uses: actions/cache/restore@v4 with: path: build/libs - key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: make libs build_flags=-j8 @@ -258,7 +258,7 @@ jobs: uses: actions/cache/save@v4 with: path: build/libs - key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Debug Runtime run: | make configure config=debug @@ -298,7 +298,7 @@ jobs: uses: actions/cache/restore@v4 with: path: build/libs - key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: make libs build_flags=-j8 @@ -307,7 +307,7 @@ jobs: uses: actions/cache/save@v4 with: path: build/libs - key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Debug Runtime run: | make configure config=debug @@ -337,7 +337,7 @@ jobs: uses: actions/cache/restore@v4 with: path: build/libs - key: libs-x86-macos-13-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-x86-macos-13-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: make libs build_flags=-j8 @@ -346,7 +346,7 @@ jobs: uses: actions/cache/save@v4 with: path: build/libs - key: libs-x86-macos-13-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-x86-macos-13-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Debug Runtime run: | make configure arch=x86-64 config=debug @@ -372,7 +372,7 @@ jobs: uses: actions/cache/restore@v4 with: path: build/libs - key: libs-arm64-macos-14-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-arm64-macos-14-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: make libs build_flags=-j8 @@ -381,7 +381,7 @@ jobs: uses: actions/cache/save@v4 with: path: build/libs - key: libs-arm64-macos-14-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-arm64-macos-14-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Debug Runtime run: | make configure arch=armv8 config=debug @@ -413,7 +413,7 @@ jobs: uses: actions/cache/restore@v4 with: path: build/libs - key: libs-windows-2022-${{ hashFiles('make.ps1', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-windows-2022-${{ hashFiles('make.ps1', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: .\make.ps1 -Command libs @@ -422,7 +422,7 @@ jobs: uses: actions/cache/save@v4 with: path: build/libs - key: libs-windows-2022-${{ hashFiles('make.ps1', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-windows-2022-${{ hashFiles('make.ps1', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Debug Runtime run: | .\make.ps1 -Command configure -Config Debug @@ -466,7 +466,7 @@ jobs: uses: actions/cache/restore@v4 with: path: build/libs - key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: make libs build_flags=-j8 @@ -475,7 +475,7 @@ jobs: uses: actions/cache/save@v4 with: path: build/libs - key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Debug Runtime run: | make configure arch=x86-64 config=debug use=${{ matrix.directives }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9ad95b335b..b9aba57a7f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -69,7 +69,7 @@ jobs: uses: actions/cache/restore@v4 with: path: build/libs - key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: make libs build_flags=-j8 @@ -78,7 +78,7 @@ jobs: uses: actions/cache/save@v4 with: path: build/libs - key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Release run: bash .ci-scripts/x86-64-release.bash env: @@ -101,7 +101,7 @@ jobs: uses: actions/cache/restore@v4 with: path: build/libs - key: libs-x86-macos-13-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-x86-macos-13-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: make libs build_flags=-j8 @@ -110,7 +110,7 @@ jobs: uses: actions/cache/save@v4 with: path: build/libs - key: libs-x86-macos-13-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-x86-macos-13-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Install Cloudsmith run: pip3 install --upgrade cloudsmith-cli - name: Release @@ -135,7 +135,7 @@ jobs: uses: actions/cache/restore@v4 with: path: build/libs - key: libs-arm64-macos-14-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-arm64-macos-14-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: make libs build_flags=-j8 @@ -144,7 +144,7 @@ jobs: uses: actions/cache/save@v4 with: path: build/libs - key: libs-arm64-macos-14-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-arm64-macos-14-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Install Cloudsmith run: pip3 install --upgrade --break-system-packages cloudsmith-cli - name: Release @@ -176,7 +176,7 @@ jobs: uses: actions/cache/restore@v4 with: path: build/libs - key: libs-windows-2022-${{ hashFiles('make.ps1', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-windows-2022-${{ hashFiles('make.ps1', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: .\make.ps1 -Command libs @@ -185,7 +185,7 @@ jobs: uses: actions/cache/save@v4 with: path: build/libs - key: libs-windows-2022-${{ hashFiles('make.ps1', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-windows-2022-${{ hashFiles('make.ps1', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Configure run: .\make.ps1 -Command configure -Config Release -Prefix "build\install\release" -Version (Get-Content .\VERSION) - name: Build diff --git a/.github/workflows/stress-test-runtime.yml b/.github/workflows/stress-test-runtime.yml index 55c4106180..0911b700ab 100644 --- a/.github/workflows/stress-test-runtime.yml +++ b/.github/workflows/stress-test-runtime.yml @@ -58,7 +58,7 @@ jobs: uses: actions/cache/restore@v4 with: path: build/libs - key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: make libs build_flags=-j8 @@ -67,7 +67,7 @@ jobs: uses: actions/cache/save@v4 with: path: build/libs - key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Debug Runtime run: | make configure config=debug @@ -120,7 +120,7 @@ jobs: uses: actions/cache/restore@v4 with: path: build/libs - key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: make libs build_flags=-j8 @@ -129,7 +129,7 @@ jobs: uses: actions/cache/save@v4 with: path: build/libs - key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Debug Runtime run: | make configure config=debug @@ -182,7 +182,7 @@ jobs: uses: actions/cache/restore@v4 with: path: build/libs - key: libs-windows-2022-${{ hashFiles('make.ps1', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-windows-2022-${{ hashFiles('make.ps1', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: .\make.ps1 -Command libs @@ -191,7 +191,7 @@ jobs: uses: actions/cache/save@v4 with: path: build/libs - key: libs-windows-2022-${{ hashFiles('make.ps1', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-windows-2022-${{ hashFiles('make.ps1', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Configure run: .\make.ps1 -Command configure -Config Debug - name: Build Debug Runtime @@ -235,7 +235,7 @@ jobs: uses: actions/cache/restore@v4 with: path: build/libs - key: libs-x86-macos-13-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-x86-macos-13-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: make libs build_flags=-j8 @@ -244,7 +244,7 @@ jobs: uses: actions/cache/save@v4 with: path: build/libs - key: libs-x86-macos-13-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-x86-macos-13-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Debug Runtime run: | make configure arch=x86-64 config=debug diff --git a/.github/workflows/update-lib-cache.yml b/.github/workflows/update-lib-cache.yml index 4deafe3bc4..0ca616fe2a 100644 --- a/.github/workflows/update-lib-cache.yml +++ b/.github/workflows/update-lib-cache.yml @@ -38,7 +38,7 @@ jobs: uses: actions/cache@v4 with: path: build/libs - key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-${{ matrix.image }}-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.cache-libs.outputs.cache-hit != 'true' run: make libs build_flags=-j8 @@ -55,7 +55,7 @@ jobs: uses: actions/cache@v4 with: path: build/libs - key: libs-x86-macos-13-${{ hashFiles('Makefile', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-x86-macos-13-${{ hashFiles('Makefile', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: make libs build_flags=-j8 @@ -72,7 +72,7 @@ jobs: uses: actions/cache@v4 with: path: build/libs - key: libs-windows-2022-${{ hashFiles('make.ps1', 'CMakeLists.txt', 'libs/CMakeLists.txt') }} + key: libs-windows-2022-${{ hashFiles('make.ps1', 'CMakeLists.txt', 'lib/CMakeLists.txt') }} - name: Build Libs if: steps.restore-libs.outputs.cache-hit != 'true' run: .\make.ps1 -Command libs