maybe have skip working [skip tests] and new attempt at macos wheels

adrn · Aug 26, 2024 · d2ac108 · d2ac108
1 parent 1cf2b4d
commit d2ac108
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,10 +13,10 @@ jobs:
     name: Check skip flags
     runs-on: ubuntu-latest
     outputs:
-      head-commit-message: ${{ steps.get_head_commit_message.outputs.headCommitMsg }}
+      head-commit-message: ${{ steps.get_head_commit_message.outputs.HEAD_COMMIT_MESSAGE }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ env.GITHUB_SHA }}
       - name: Get head commit message
@@ -27,8 +27,7 @@ jobs:
     name: Python ${{ matrix.python-version }} on ${{ matrix.os }} with numpy ${{ matrix.numpy-version }}, no gsl ${{ matrix.gala-nogsl }}, deps ${{ matrix.pip-test-deps }}
     runs-on: ${{ matrix.os }}
     needs: check_skip_flags
-    # if: ${{ github.event.pull_request.draft == false && !contains(github.event.pull_request.labels.*.name, 'docs only') && !contains(github.event.head_commit.message, '[skip tests]')}}
-    if: ${{ ! contains(needs.check_skip_flags.outputs.HEAD_COMMIT_MESSAGE, '[skip tests]') }}
+    if: ${{ github.event.pull_request.draft == false && !contains(github.event.pull_request.labels.*.name, 'docs only') && !contains(needs.check_skip_flags.outputs.head-commit-message, '[skip tests]') }}
     strategy:
       fail-fast: true
       matrix:
@@ -71,7 +70,7 @@ jobs:
           allow-prereleases: true
 
       - name: WTF
-        run: echo ${{ github.event.head_commit.message }}
+        run: echo ${{ needs.check_skip_flags.outputs.HEAD_COMMIT_MESSAGE }}
 
       # # For animation tests
       # - uses: FedericoCarboni/setup-ffmpeg@v3

diff --git a/.github/workflows/tutorials.yml b/.github/workflows/tutorials.yml
@@ -11,10 +11,25 @@ on:
       - published
 
 jobs:
+  check_skip_flags:
+    name: Check skip flags
+    runs-on: ubuntu-latest
+    outputs:
+      head-commit-message: ${{ steps.get_head_commit_message.outputs.HEAD_COMMIT_MESSAGE }}
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.GITHUB_SHA }}
+      - name: Get head commit message
+        id: get_head_commit_message
+        run: echo "HEAD_COMMIT_MESSAGE=$(git show -s --format=%s)" >> "$GITHUB_OUTPUT"
+
   notebooks:
     name: "Build the notebooks for the docs"
     runs-on: ubuntu-latest
-    if: github.event.pull_request.draft == false && !contains(github.event.head_commit.message, '[skip docs]')
+    needs: check_skip_flags
+    if: ${{ github.event.pull_request.draft == false && !contains(needs.check_skip_flags.outputs.head-commit-message, '[skip docs]') }}
     steps:
       - uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -29,7 +29,7 @@ jobs:
           - ["2", "cp311-*"]
           - ["3", "cp312-*"]
         os:
-          # - "macos-14"
+          - "macos-14"
           - "ubuntu-latest"
 
     steps:
@@ -48,6 +48,7 @@ jobs:
           CIBW_SKIP: "*-win32 *musllinux* pp* *i686"
           CIBW_BEFORE_ALL_LINUX: dnf install gsl gsl-devel || apt-get install gsl-bin libgsl0-dev
           CIBW_BEFORE_ALL_MACOS: brew install gsl pipx
+          MACOSX_DEPLOYMENT_TARGET: 14.0
 
       - uses: actions/upload-artifact@v4
         with: