diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-05-13 10:19:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-13 10:19:47 -0700 |
| commit | 6cb0bd7fc3bee82d38d8cf99b9e1bbfa4d35a845 (patch) | |
| tree | f21c793f7b5734a9827a52231f2fe6b8035d86a3 | |
| parent | b077cf2679bd9127457b1afe2b05dfcebdae00cd (diff) | |
| parent | 7df2405b38ebd91b9b542167829883ddd6c02295 (diff) | |
| download | git-6cb0bd7fc3bee82d38d8cf99b9e1bbfa4d35a845.tar.gz | |
Merge branch 'jk/ci-macos-gcc13-fix'
CI fix.
* jk/ci-macos-gcc13-fix:
ci: stop installing "gcc-13" for osx-gcc
ci: avoid bare "gcc" for osx-gcc job
ci: drop mention of BREW_INSTALL_PACKAGES variable
| -rw-r--r-- | .github/workflows/main.yml | 3 | ||||
| -rwxr-xr-x | ci/install-dependencies.sh | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5838986895..13cc0fe807 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -284,8 +284,7 @@ jobs: cc: clang pool: macos-13 - jobname: osx-gcc - cc: gcc - cc_package: gcc-13 + cc: gcc-13 pool: macos-13 - jobname: linux-gcc-default cc: gcc diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index c196e56762..2e7688ae8b 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -69,8 +69,6 @@ macos-*) export HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 # Uncomment this if you want to run perf tests: # brew install gnu-time - test -z "$BREW_INSTALL_PACKAGES" || - brew install $BREW_INSTALL_PACKAGES brew link --force gettext mkdir -p "$CUSTOM_PATH" |