From 43a52bccf5bf17217a2734f4680c00a102f82cac Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sun, 24 Dec 2023 08:49:59 +0100
Subject: Merging upstream version 20.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .github/workflows/python-publish.yml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to '.github/workflows/python-publish.yml')

diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
index 54d79f4..fd418b6 100644
--- a/.github/workflows/python-publish.yml
+++ b/.github/workflows/python-publish.yml
@@ -8,9 +8,6 @@ on:
 permissions:
   contents: read
 
-env:
-  python_interpreters: 3.7 3.8 3.9 3.10 3.11
-
 jobs:
   build-rs:
     strategy:
@@ -29,6 +26,9 @@ jobs:
         - os: windows
           target: i686
           python-architecture: x86
+        exclude:
+        - os: windows
+          target: aarch64
     runs-on: ${{ (matrix.os == 'linux' && 'ubuntu') || matrix.os }}-latest
     steps:
     - uses: actions/checkout@v3
@@ -37,36 +37,34 @@ jobs:
         python-version: '3.10'
         architecture: ${{ matrix.python-architecture || 'x64' }}
     - name: Build wheels
-      working-directory: ./sqlglotrs
       uses: PyO3/maturin-action@v1
       with:
         target: ${{ matrix.target }}
-        args: --release --out dist --interpreter $python_interpreters
+        args: --release --out dist --interpreter 3.7 3.8 3.9 3.10 3.11 3.12
         sccache: 'true'
         manylinux: auto
+        working-directory: ./sqlglotrs
     - name: Upload wheels
-      working-directory: ./sqlglotrs
       uses: actions/upload-artifact@v3
       with:
         name: wheels
-        path: dist
+        path: sqlglotrs/dist
 
   sdist-rs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
     - name: Build sdist
-      working-directory: ./sqlglotrs
       uses: PyO3/maturin-action@v1
       with:
         command: sdist
         args: --out dist
+        working-directory: ./sqlglotrs
     - name: Upload sdist
-      working-directory: ./sqlglotrs
       uses: actions/upload-artifact@v3
       with:
         name: wheels
-        path: dist
+        path: sqlglotrs/dist
 
   deploy-rs:
     runs-on: ubuntu-latest
@@ -76,7 +74,6 @@ jobs:
       with:
         name: wheels
     - name: Publish to PyPI
-      working-directory: ./sqlglotrs
       uses: PyO3/maturin-action@v1
       env:
         MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
-- 
cgit v1.2.3