From 95d0179246e63f76d1728751e0f4a7472d5e85f2 Mon Sep 17 00:00:00 2001
From: Cosimo Lupo <clupo@google.com>
Date: Fri, 18 Oct 2024 14:30:03 +0200
Subject: [PATCH] update ci workflows to build wheels for python3.13

---
 .github/workflows/ci.yml | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index de183e8..8dfa37b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        # macos-13 runners are still x86_64, macos-14 (latest) are arm64; we want to build
+        # the x86_64 wheel on/for x86_64 macs
+        os: [macos-13, ubuntu-latest, windows-latest]
         arch: [auto64]
         include:
           - os: macos-latest
@@ -38,11 +40,11 @@ jobs:
           - os: windows-latest
             arch: x86
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
     - name: Set up Python 3.x
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: "3.x"
     - name: Download pre-compiled libskia
@@ -60,7 +62,7 @@ jobs:
       run: pip install cibuildwheel
     - name: Build and Test Wheels
       run: python -m cibuildwheel --output-dir wheelhouse
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: skia_pathops-${{ matrix.os }}-${{ matrix.arch }}
         path: wheelhouse/*.whl
@@ -70,7 +72,7 @@ jobs:
     strategy:
       matrix:
         # aarch64 uses qemu so it's slow, build each py version in parallel jobs
-        python: [38, 39, 310, 311, 312]
+        python: [38, 39, 310, 311, 312, 313]
         arch: [aarch64]
     env:
       # Skip building aarch64 wheels for musllinux until I figure out why I get
@@ -98,7 +100,7 @@ jobs:
       run: pip install cibuildwheel
     - name: Build and Test Wheels
       run: python -m cibuildwheel --output-dir wheelhouse
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: skia_pathops-${{ matrix.python }}-linux-${{ matrix.arch }}
         path: wheelhouse/*.whl
@@ -122,9 +124,10 @@ jobs:
         python -m pip install --upgrade pip
         pip install --upgrade setuptools wheel twine
     - name: Download artifacts from build jobs
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v4
       with:
         path: wheelhouse/
+        merge-multiple: true
     - name: Move wheels to dist/ directory
       run: |
         ls wheelhouse/*
@@ -156,13 +159,8 @@ jobs:
         fi
     - name: Create GitHub release
       id: create_release
-      uses: actions/create-release@v1
-      env:
-        # This token is provided by Actions, you do not need to create your own token
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      uses: softprops/action-gh-release@v2
       with:
-        tag_name: ${{ github.ref }}
-        release_name: ${{ github.ref }}
         body_path: "${{ runner.temp }}/release_notes.md"
         draft: false
         prerelease: ${{ env.IS_PRERELEASE }}