From f7996ba56fd8f75e0445d98a794e631227b899cb Mon Sep 17 00:00:00 2001 From: Tucker Alban Date: Tue, 9 Jan 2024 13:50:44 -0500 Subject: [PATCH] Fix "macos" ci tests. (#2135) --- .github/workflows/ci-auto-commit-mac.yml | 6 +++--- .github/workflows/ci-base-tests-mac.yml | 14 ++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci-auto-commit-mac.yml b/.github/workflows/ci-auto-commit-mac.yml index 3f656e28c2..266b54d9ba 100644 --- a/.github/workflows/ci-auto-commit-mac.yml +++ b/.github/workflows/ci-auto-commit-mac.yml @@ -11,7 +11,7 @@ env: jobs: auto-commit-mac: - runs-on: macos-11 + runs-on: macos-12 steps: - name: Checkout uses: actions/checkout@v3 @@ -20,11 +20,11 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: "3.8" + python-version: "3.9" - name: Update requirements run: | cd $GITHUB_WORKSPACE - python3.8 -m venv ${{env.venv_dir}} + python3.9 -m venv ${{env.venv_dir}} . ${{env.venv_dir}}/bin/activate pip install --upgrade pip pip install wheel==0.38.4 diff --git a/.github/workflows/ci-base-tests-mac.yml b/.github/workflows/ci-base-tests-mac.yml index 8c9a00a878..5290ec769a 100644 --- a/.github/workflows/ci-base-tests-mac.yml +++ b/.github/workflows/ci-base-tests-mac.yml @@ -12,7 +12,7 @@ env: jobs: base-tests-mac: - runs-on: macos-11 + runs-on: macos-12 strategy: matrix: tests: @@ -29,12 +29,10 @@ jobs: uses: actions/checkout@v3 with: ref: master - - name: Setup Python - run: | - brew update - brew install python@3.8 - brew unlink python@3.9 - brew link --force --overwrite python@3.8 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: "3.9" - name: Setup SUMO run: | brew install xquartz @@ -43,7 +41,7 @@ jobs: brew install geos - name: Install dependencies run: | - python3.8 -m venv ${{env.venv_dir}} + python3.9 -m venv ${{env.venv_dir}} . ${{env.venv_dir}}/bin/activate pip install --upgrade pip pip install wheel==0.38.4