]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/ci-macos-gcc13-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 May 2024 17:19:47 +0000 (10:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 May 2024 17:19:47 +0000 (10:19 -0700)
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

1  2 
.github/workflows/main.yml
ci/install-dependencies.sh

Simple merge
index c196e56762011a344ee42bef679e106cc97b8801,fa0c00c60603a6bc3f9d6b0a794696b38aff3d8f..2e7688ae8b8d26f6b333453cfa071a9041d14f78
@@@ -69,15 -34,14 +69,13 @@@ 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 "$P4_PATH"
 -      pushd "$P4_PATH"
 -              wget -q "$P4WHENCE/bin.macosx1015x86_64/helix-core-server.tgz" &&
 -              tar -xf helix-core-server.tgz &&
 -              sudo xattr -d com.apple.quarantine p4 p4d 2>/dev/null || true
 -      popd
 +      mkdir -p "$CUSTOM_PATH"
 +      wget -q "$P4WHENCE/bin.macosx1015x86_64/helix-core-server.tgz" &&
 +      tar -xf helix-core-server.tgz -C "$CUSTOM_PATH" p4 p4d &&
 +      sudo xattr -d com.apple.quarantine "$CUSTOM_PATH/p4" "$CUSTOM_PATH/p4d" 2>/dev/null || true
 +      rm helix-core-server.tgz
  
        if test -n "$CC_PACKAGE"
        then