From ba49f320d3174831459d2d3d699b778cbd5ef84b Mon Sep 17 00:00:00 2001 From: Orion Hodson Date: Tue, 29 Aug 2023 14:32:18 +0100 Subject: [PATCH 1/2] Github runner: Upgrade LLVM to LLVM 16 Recent github runner config changes for Windows breaks use of LLVM 15 and does not install LLVM 16 in the image. This change adds an LLVM upgrade step that should pull in LLVM 16. This follows https://github.com/scikit-image/scikit-image/pull/7109. Bug: https://github.com/actions/runner-images/issues/812 --- .github/workflows/test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b4ee72bfb89..d40b9b1190f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: uses: actions/cache@v3 with: path: ~/bazel-disk-cache - key: bazel-disk-cache-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.bazelversion', '.bazelrc', 'WORKSPACE') }} + key: bazel-disk-cache-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.bazelversion', '.bazelrc', 'WORKSPACE', '.github/workflows/test.yml') }} # Use an older cache key, if available. restore-keys: | bazel-disk-cache-${{ runner.os }}-${{ runner.arch }}- @@ -57,8 +57,11 @@ jobs: # bazel generates huge amounts of debug information on Windows which slows down the build # and takes up an excessive amount of cache space. run: | + bazelisk clean --expunge + Remove-Item -Path ~/bazel-disk-cache -Force -Recurse [System.IO.File]::WriteAllLines((Join-Path -Path $env:USERPROFILE -ChildPath '.bazelrc'), 'startup --output_user_root=C:/tmp') [System.IO.File]::WriteAllLines((Join-Path -Path $env:USERPROFILE -ChildPath '.bazelrc'), 'build:windows --config=windows_no_dbg') + choco upgrade llvm - name: Bazel build # timestamps are no longer being added here, the GitHub logs include timestamps (Use # 'Show timestamps' on the web interface) From 5312fa53262cecbb1972a4df9f4b191f20cbd3da Mon Sep 17 00:00:00 2001 From: Felix Hanau Date: Tue, 29 Aug 2023 13:30:20 -0500 Subject: [PATCH 2/2] fixup! Github runner: Upgrade LLVM to LLVM 16 --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d40b9b1190f..85049bf7bf0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -56,9 +56,9 @@ jobs: # Set a custom output dir and disable generating debug information on Windows. By default, # bazel generates huge amounts of debug information on Windows which slows down the build # and takes up an excessive amount of cache space. + # bazelisk clean --expunge + # Remove-Item -Path ~/bazel-disk-cache -Force -Recurse run: | - bazelisk clean --expunge - Remove-Item -Path ~/bazel-disk-cache -Force -Recurse [System.IO.File]::WriteAllLines((Join-Path -Path $env:USERPROFILE -ChildPath '.bazelrc'), 'startup --output_user_root=C:/tmp') [System.IO.File]::WriteAllLines((Join-Path -Path $env:USERPROFILE -ChildPath '.bazelrc'), 'build:windows --config=windows_no_dbg') choco upgrade llvm