From 8db42ebda59a0fad81126263b7593efb50a1baa2 Mon Sep 17 00:00:00 2001 From: Adam Novak Date: Fri, 20 Nov 2026 17:13:08 -0500 Subject: [PATCH 1/2] Bump MacOS CI versions --- .github/workflows/testmac.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/testmac.yml b/.github/workflows/testmac.yml index 284a234d1a..3debf6e66c 100644 --- a/.github/workflows/testmac.yml +++ b/.github/workflows/testmac.yml @@ -15,7 +15,7 @@ on: jobs: testmac: name: Test on Mac - runs-on: macos-15 + runs-on: macos-26-intel steps: - name: Use cache @@ -26,14 +26,14 @@ jobs: lib include bin - key: ${{ runner.os }}-15-${{ github.ref }} + key: ${{ runner.os }}-26-${{ github.ref }} # Restore keys are a "list", but really only a multiline string is # accepted. Also we match by prefix. And the most recent cache is # used, not the most specific. # See: https://docs.github.com/en/actions/guides/caching-dependencies-to-speed-up-workflows#matching-a-cache-key restore-keys: | - ${{ runner.os }}-15-${{ github.base_ref }} - ${{ runner.os }}-15 + ${{ runner.os }}-26-${{ github.base_ref }} + ${{ runner.os }}-26 - name: Checkout code without submodules uses: actions/checkout@v2 @@ -41,7 +41,7 @@ jobs: - name: Install Node uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 26 - name: Get or restore dependencies run: scripts/restore-deps.sh @@ -55,7 +55,6 @@ jobs: # We also update Protobuf to make sure we have 3.21.3+ # to avoid problems with ABI changes with/without -DNDEBUG. # And we update libomp to make extra sure it will be picked up by the compiler. - # We pre-install a pinned txm to work around https://github.com/anko/txm/issues/8 run: | echo "Not cleaning" && \ echo Skip brew bundle cleanup --force && \ @@ -67,7 +66,7 @@ jobs: brew install --verbose protobuf && \ brew install --verbose libomp && \ brew install --verbose bwa graphviz && \ - npm install -g txm@7.4.5 && \ + npm install -g txm@8.2.0 && \ brew config && \ (brew doctor || echo "brew doctor is unhappy") From cf987226f5ff68c77f9d6d9f500e3509b2635bf0 Mon Sep 17 00:00:00 2001 From: Adam Novak Date: Fri, 20 Nov 2026 17:15:48 -0500 Subject: [PATCH 2/2] Go back to removing unlisted Homebrew packages on CI --- .github/workflows/testmac.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/testmac.yml b/.github/workflows/testmac.yml index 3debf6e66c..30ef3e5d30 100644 --- a/.github/workflows/testmac.yml +++ b/.github/workflows/testmac.yml @@ -48,16 +48,16 @@ jobs: - name: Install packages # We don't use artemnovichkov/action-homebrew because that's for Linux. - # We want to uninstall everything we don't need in order to prevent linking + # We uninstall everything we don't need in order to prevent linking # conflicts with existing/outdated packages, which we can't resolve # because there's no way to tell Homebrew to force-link when installing - # from a Brewfile. But we can't because that seesm to want to *install* OpenSSL 1.1. + # from a Brewfile. # We also update Protobuf to make sure we have 3.21.3+ # to avoid problems with ABI changes with/without -DNDEBUG. # And we update libomp to make extra sure it will be picked up by the compiler. run: | - echo "Not cleaning" && \ - echo Skip brew bundle cleanup --force && \ + echo "Removing unlisted packages" && \ + brew bundle cleanup --force && \ echo "Installing" && \ brew bundle install --verbose && \ echo "Updating" && \