Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "[GitHub] Fix slow sccache install on macOS by upgrading macOS version (#77165)" #77270

Merged
merged 1 commit into from
Jan 8, 2024

Conversation

linux4life798
Copy link
Contributor

@linux4life798 linux4life798 commented Jan 8, 2024

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

… version (llvm#77165)"

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
@llvmbot
Copy link
Collaborator

llvmbot commented Jan 8, 2024

@llvm/pr-subscribers-github-workflow

Author: Craig Hesling (linux4life798)

Changes

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


Full diff: https://github.com/llvm/llvm-project/pull/77270.diff

1 Files Affected:

  • (modified) .github/workflows/llvm-project-tests.yml (+8-2)
diff --git a/.github/workflows/llvm-project-tests.yml b/.github/workflows/llvm-project-tests.yml
index 594831ee6b5f52..fadaea129e5088 100644
--- a/.github/workflows/llvm-project-tests.yml
+++ b/.github/workflows/llvm-project-tests.yml
@@ -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:
@@ -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.
@@ -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 }}'

@linux4life798
Copy link
Contributor Author

@tstellar, any chance you could review and merge if approved?

This is just a revert of #77165.
I would rather revert first to ensure no one encounter the new cache issue and then work on the fix.

@tstellar tstellar merged commit de15c55 into llvm:main Jan 8, 2024
6 checks passed
@linux4life798 linux4life798 deleted the revert-sccache-slow-install branch January 9, 2024 05:00
justinfargnoli pushed a commit to justinfargnoli/llvm-project that referenced this pull request Jan 28, 2024
… 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants