Skip to content

Commit

Permalink
Revert "[GitHub] Fix slow sccache install on macOS by upgrading macOS…
Browse files Browse the repository at this point in the history
… version (llvm#77165)" (llvm#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:
llvm#77165
  • Loading branch information
linux4life798 authored and justinfargnoli committed Jan 28, 2024
1 parent 4197540 commit 288d9d8
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/llvm-project-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
required: false
os_list:
required: false
default: '["ubuntu-latest", "windows-2019", "macOS-12"]'
default: '["ubuntu-latest", "windows-2019", "macOS-11"]'
workflow_call:
inputs:
build_target:
Expand All @@ -34,7 +34,9 @@ on:
type: string
# Use windows-2019 due to:
# https://developercommunity.visualstudio.com/t/Prev-Issue---with-__assume-isnan-/1597317
default: '["ubuntu-latest", "windows-2019", "macOS-12"]'
# We're using a specific version of macOS due to:
# https://github.com/actions/virtual-environments/issues/5900
default: '["ubuntu-latest", "windows-2019", "macOS-11"]'

concurrency:
# Skip intermediate builds: always.
Expand Down Expand Up @@ -89,6 +91,10 @@ jobs:
variant: sccache
- name: Build and Test
uses: llvm/actions/build-test-llvm-project@main
env:
# Workaround for https://github.com/actions/virtual-environments/issues/5900.
# This should be a no-op for non-mac OSes
PKG_CONFIG_PATH: /usr/local/Homebrew/Library/Homebrew/os/mac/pkgconfig//12
with:
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 }}'
build_target: '${{ inputs.build_target }}'
Expand Down

0 comments on commit 288d9d8

Please sign in to comment.