admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jk/ci-macos-gcc13-fix'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2024-05-13 10:19:47 -07:00
parent b077cf2679 7df2405b38
commit 6cb0bd7fc3
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/main.yml vendored
View File

@@ -284,8 +284,7 @@ jobs:
cc: clang cc: clang
pool: macos-13 pool: macos-13
- jobname: osx-gcc - jobname: osx-gcc
cc: gcc cc: gcc-13
cc_package: gcc-13
pool: macos-13 pool: macos-13
- jobname: linux-gcc-default - jobname: linux-gcc-default
cc: gcc cc: gcc

2
ci/install-dependencies.sh
View File

@@ -69,8 +69,6 @@ macos-*)
export HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 export HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1
# Uncomment this if you want to run perf tests: # Uncomment this if you want to run perf tests:
# brew install gnu-time # brew install gnu-time
test -z "$BREW_INSTALL_PACKAGES" ||
brew install $BREW_INSTALL_PACKAGES
brew link --force gettext brew link --force gettext
mkdir -p "$CUSTOM_PATH" mkdir -p "$CUSTOM_PATH"