From 694b65e0aafd464d5eff3482a75ecb541cd84785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klemens=20B=C3=B6swirth?= Date: Tue, 13 Jun 2023 16:20:48 +0200 Subject: [PATCH 1/2] ci: fix cirrus clone script --- .cirrus.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 307935a9cd4..90acf19ca65 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -270,7 +270,8 @@ task: $CIRRUS_WORKING_DIR git reset --hard $CIRRUS_CHANGE_IN_REPO else - git clone https://x-access-token:${CIRRUS_REPO_CLONE_TOKEN}@github.com/${CIRRUS_REPO_FULL_NAME}.git $CIRRUS_WORKING_DIR + git clone --branch=$CIRRUS_BASE_BRANCH https://x-access-token:${CIRRUS_REPO_CLONE_TOKEN}@github.com/${CIRRUS_REPO_FULL_NAME}.git \ + $CIRRUS_WORKING_DIR git fetch origin pull/$CIRRUS_PR/head:pull/$CIRRUS_PR git config user.email "nobody@example.com" git config user.name "nobody" @@ -313,7 +314,8 @@ task: $CIRRUS_WORKING_DIR git reset --hard $CIRRUS_CHANGE_IN_REPO else - git clone https://x-access-token:${CIRRUS_REPO_CLONE_TOKEN}@github.com/${CIRRUS_REPO_FULL_NAME}.git $CIRRUS_WORKING_DIR + git clone --branch=$CIRRUS_BASE_BRANCH https://x-access-token:${CIRRUS_REPO_CLONE_TOKEN}@github.com/${CIRRUS_REPO_FULL_NAME}.git \ + $CIRRUS_WORKING_DIR git fetch origin pull/$CIRRUS_PR/head:pull/$CIRRUS_PR git config user.email "nobody@example.com" git config user.name "nobody" From 1b10a1892e68e3fc9149cf373b6fc3b69ed24a12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klemens=20B=C3=B6swirth?= Date: Tue, 13 Jun 2023 20:02:44 +0200 Subject: [PATCH 2/2] ci: fix macos python issue --- .github/workflows/macOS.yml | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml index b9590b1fcd8..bc45bfd52b9 100644 --- a/.github/workflows/macOS.yml +++ b/.github/workflows/macOS.yml @@ -75,12 +75,31 @@ jobs: - name: Install Dependencies run: | - brew update + set -ex + brew config - # Unlink parallel package, because of conflict with moreutils - brew unlink parallel || >&2 printf 'Unlinking parallel failed.`\n' - # Uninstall old Python versions and azure-cli due to file conflicts - brew remove azure-cli pipx python@3.10 python@3.11|| >&2 printf 'Uninstalling old python versions and azure-cli failed.`\n' + + brew update + + # homebrew fails to upgrade python due to unlinking failure + # (cf. https://github.com/actions/setup-python/issues/577 ) + rm -f /usr/local/bin/2to3 + rm -f /usr/local/bin/idle3 + rm -f /usr/local/bin/pydoc3 + rm -f /usr/local/bin/python3 + rm -f /usr/local/bin/python3-config + rm -f /usr/local/bin/2to3-3.11 + rm -f /usr/local/bin/idle3.11 + rm -f /usr/local/bin/pydoc3.11 + rm -f /usr/local/bin/python3.11 + rm -f /usr/local/bin/python3.11-config + rm -f /usr/local/lib/libtcl8.6.dylib + rm -f /usr/local/lib/libtk8.6.dylib + rm -f /usr/local/bin/go + rm -f /usr/local/bin/gofmt + + brew upgrade + brew install augeas \ antlr \ antlr4-cpp-runtime \ @@ -113,10 +132,13 @@ jobs: yajl \ yaml-cpp \ zeromq + if [ "$CC" = 'clang' ]; then brew install --cask oclint fi + brew install --cask adoptopenjdk + # Try to install `checkbashisms` (The file server that hosts the package is unfortunately quite unreliable.) brew install checkbashisms || >&2 printf 'Warning: Unable to install `checkbashims`\n'