Skip to content

Commit de15c55

Browse files
Revert "[GitHub] Fix slow sccache install on macOS by upgrading macOS version (#77165)" (#77270)
This reverts commit 602c8fa, due to an sccache issue seen on larger builds using macOS-12 runners. The issue is documented in in the following issue: hendrikmuhs/ccache-action#174 The original PR is the following: #77165
1 parent 6196828 commit de15c55

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

.github/workflows/llvm-project-tests.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
required: false
1515
os_list:
1616
required: false
17-
default: '["ubuntu-latest", "windows-2019", "macOS-12"]'
17+
default: '["ubuntu-latest", "windows-2019", "macOS-11"]'
1818
workflow_call:
1919
inputs:
2020
build_target:
@@ -34,7 +34,9 @@ on:
3434
type: string
3535
# Use windows-2019 due to:
3636
# https://developercommunity.visualstudio.com/t/Prev-Issue---with-__assume-isnan-/1597317
37-
default: '["ubuntu-latest", "windows-2019", "macOS-12"]'
37+
# We're using a specific version of macOS due to:
38+
# https://github.com/actions/virtual-environments/issues/5900
39+
default: '["ubuntu-latest", "windows-2019", "macOS-11"]'
3840

3941
concurrency:
4042
# Skip intermediate builds: always.
@@ -89,6 +91,10 @@ jobs:
8991
variant: sccache
9092
- name: Build and Test
9193
uses: llvm/actions/build-test-llvm-project@main
94+
env:
95+
# Workaround for https://github.com/actions/virtual-environments/issues/5900.
96+
# This should be a no-op for non-mac OSes
97+
PKG_CONFIG_PATH: /usr/local/Homebrew/Library/Homebrew/os/mac/pkgconfig//12
9298
with:
9399
cmake_args: '-GNinja -DLLVM_ENABLE_PROJECTS="${{ inputs.projects }}" -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLDB_INCLUDE_TESTS=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache ${{ inputs.extra_cmake_args }}'
94100
build_target: '${{ inputs.build_target }}'

0 commit comments

Comments
 (0)