From 64e6f6db217158f553e4b4ecbf76e49f58791f6b Mon Sep 17 00:00:00 2001 From: Ben Millwood Date: Thu, 16 May 2024 12:14:47 +0100 Subject: [PATCH 1/4] run github checks on macos --- .github/workflows/checks.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 92e5d6518..0058a9082 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -40,13 +40,16 @@ permissions: jobs: compatibility-checks: name: Compatibility Checks - runs-on: ubuntu-latest + runs-on: ${{ matrix.runs-on }} strategy: matrix: python-version: - "3.8" - "3.9" - "3.10" + runs-on: + - ubuntu-latest + - macos-latest steps: - uses: actions/checkout@v3 - name: Install Poetry @@ -117,9 +120,12 @@ jobs: notebook-checks: name: Notebook Checks - runs-on: ubuntu-latest + runs-on: ${{ matrix.runs-on }} strategy: matrix: + runs-on: + - ubuntu-latest + - macos-latest notebook: # - "Activation_Patching_in_TL_Demo" # - "Attribution_Patching_Demo" From 880669839a6ae099fa41f44c381c6bfd3ff816ef Mon Sep 17 00:00:00 2001 From: Ben Millwood Date: Thu, 16 May 2024 14:25:53 +0100 Subject: [PATCH 2/4] turn off fail-fast for now --- .github/workflows/checks.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 0058a9082..138023879 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -42,6 +42,7 @@ jobs: name: Compatibility Checks runs-on: ${{ matrix.runs-on }} strategy: + fail-fast: false matrix: python-version: - "3.8" @@ -122,6 +123,7 @@ jobs: name: Notebook Checks runs-on: ${{ matrix.runs-on }} strategy: + fail-fast: false matrix: runs-on: - ubuntu-latest From 6b168cf47eacbf11589026659d28bdae060939e9 Mon Sep 17 00:00:00 2001 From: Ben Millwood Date: Thu, 16 May 2024 14:42:40 +0100 Subject: [PATCH 3/4] try macos-13 This on the theory that it's only MPS specifically that doesn't work, and MacOS 13 maybe (?) doesn't have MPS --- .github/workflows/checks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 138023879..5798f5656 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -50,7 +50,7 @@ jobs: - "3.10" runs-on: - ubuntu-latest - - macos-latest + - macos-13 # as of 2024-05-16 macos-latest fails with MPS errors, see #598 steps: - uses: actions/checkout@v3 - name: Install Poetry @@ -127,7 +127,7 @@ jobs: matrix: runs-on: - ubuntu-latest - - macos-latest + # - macos-13 # need to install pandoc in a mac-friendly way notebook: # - "Activation_Patching_in_TL_Demo" # - "Attribution_Patching_Demo" From 7328ebde4edac87fa47db11701454895743f2a1b Mon Sep 17 00:00:00 2001 From: Ben Millwood Date: Thu, 23 May 2024 12:03:46 +0100 Subject: [PATCH 4/4] upgrade python versions, only run macos on 3.11 --- .github/workflows/checks.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 5798f5656..a9ee67561 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -45,12 +45,16 @@ jobs: fail-fast: false matrix: python-version: - - "3.8" - "3.9" - "3.10" + - "3.11" runs-on: - ubuntu-latest - - macos-13 # as of 2024-05-16 macos-latest fails with MPS errors, see #598 + include: + - python-version: "3.11" + runs-on: macos-13 + - python-version: "3.11" + runs-on: macos-latest steps: - uses: actions/checkout@v3 - name: Install Poetry @@ -225,4 +229,4 @@ jobs: with: folder: docs/build clean-exclude: | - *.*.*/ \ No newline at end of file + *.*.*/