GHA update

mdavidsaver · Jun 18, 2024 · a7c573a · a7c573a
1 parent 77299b9
commit a7c573a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 29 deletions.
diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml
@@ -139,7 +139,7 @@ jobs:
             extra: "CMD_CXXFLAGS=-analysis"
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: "apt-get install"
@@ -198,7 +198,7 @@ jobs:
       run: grep . cfg/*
     - name: Upload tapfiles Artifact
       if: ${{ always() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: tapfiles ${{ matrix.name }}
         path: '**/O.*/*.tap'
@@ -258,7 +258,7 @@ jobs:
         # people would rather just break all existing scripts...
         [ -e /usr/bin/python ] || ln -sf /usr/bin/python3 /usr/bin/python
         python --version
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Automatic core dumper analysis
@@ -281,7 +281,7 @@ jobs:
       run: ./.ci-local/cdt-check.sh
     - name: Upload tapfiles Artifact
       if: ${{ always() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: tapfiles ${{ matrix.name }}
         path: '**/O.*/*.tap'
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Apt
       run: |
         sudo apt-get update

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -35,35 +35,25 @@ jobs:
             source: true
 
           # OSX py builds
-          - name: osx 3.6 intel
-            os: macos-latest
-            python: "3.6"
-            piparch: macosx_10_9_intel
-
-          - name: osx 3.7 intel
-            os: macos-latest
-            python: "3.7"
-            piparch: macosx_10_9_intel
-
-          - name: osx 3.8 intel
+          - name: osx 3.8 universal2
             os: macos-latest
             python: "3.8"
-            piparch: macosx_10_9_intel
+            piparch: macosx_10_10_universal2
 
-          - name: osx 3.9 intel
+          - name: osx 3.9 universal2
             os: macos-latest
             python: "3.9"
-            piparch: macosx_10_9_intel
+            piparch: macosx_10_10_universal2
 
-          - name: osx 3.10 intel
+          - name: osx 3.10 universal2
             os: macos-latest
             python: "3.10"
-            piparch: macosx_10_10_intel
+            piparch: macosx_10_10_universal2
 
-          - name: osx 3.11 intel
+          - name: osx 3.11 universal2
             os: macos-latest
             python: "3.11"
-            piparch: macosx_10_10_intel
+            piparch: macosx_10_10_universal2
 
           # Windows py builds
 
@@ -108,7 +98,7 @@ jobs:
             piparch: win_amd64
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Automatic core dumper analysis
@@ -117,7 +107,7 @@ jobs:
 
       - name: Setup native python
         if: matrix.python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           #architecture: x64
@@ -296,12 +286,12 @@ jobs:
             pre: linux32
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Setup native python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python || '3.7' }}
           #architecture: x64
@@ -358,9 +348,9 @@ jobs:
         run: ls dist/*
 
       - name: Save Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: epicscorelibs
+          name: "epicscorelibs ${{ matrix.name }}"
           path: dist/*
 
       - name: Check wheels