Merging upstream version 23.10.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 42 insertions, 43 deletions

diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
index 3c89a4b..fdba150 100644
--- a/.github/workflows/python-publish.yml
+++ b/.github/workflows/python-publish.yml
@@ -9,47 +9,6 @@ permissions:
   contents: read
 
 jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v3
-      with:
-        python-version: "3.10"
-    - name: Install dependencies
-      run: |
-        python -m venv .venv
-        source ./.venv/bin/activate
-        python -m pip install --upgrade pip
-        pip install setuptools wheel twine
-        make install-dev
-    - name: Build and publish
-      env:
-        TWINE_USERNAME: __token__
-        TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
-      run: |
-        source ./.venv/bin/activate
-        python setup.py sdist bdist_wheel
-        twine upload dist/*
-    - name: Update API docs
-      run: |
-        source ./.venv/bin/activate
-        make docs
-    - name: Update CHANGELOG
-      id: changelog
-      uses: requarks/changelog-action@v1
-      with:
-        token: ${{ github.token }}
-        tag: ${{ github.ref_name }}
-    - name: Commit API docs, CHANGELOG.md
-      uses: stefanzweifel/git-auto-commit-action@v4
-      with:
-        branch: main
-        commit_message: 'docs: update API docs, CHANGELOG.md for ${{ github.ref_name }} [skip ci]'
-        file_pattern: 'docs CHANGELOG.md'
   build-rs:
     strategy:
       matrix:
@@ -71,7 +30,6 @@ jobs:
         - os: windows
           target: aarch64
     runs-on: ${{ (matrix.os == 'linux' && 'ubuntu') || matrix.os }}-latest
-    needs: [deploy]
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-python@v4
@@ -94,7 +52,6 @@ jobs:
 
   sdist-rs:
     runs-on: ubuntu-latest
-    needs: [deploy]
     steps:
     - uses: actions/checkout@v3
     - name: Build sdist
@@ -123,3 +80,45 @@ jobs:
       with:
         command: upload
         args: --non-interactive --skip-existing *
+
+  deploy:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python
+      uses: actions/setup-python@v3
+      with:
+        python-version: "3.10"
+    - name: Install dependencies
+      run: |
+        python -m venv .venv
+        source ./.venv/bin/activate
+        python -m pip install --upgrade pip
+        pip install setuptools wheel twine
+        make install-dev
+    - name: Build and publish
+      env:
+        TWINE_USERNAME: __token__
+        TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
+      run: |
+        source ./.venv/bin/activate
+        python setup.py sdist bdist_wheel
+        twine upload dist/*
+    - name: Update API docs
+      run: |
+        source ./.venv/bin/activate
+        make docs
+    - name: Update CHANGELOG
+      id: changelog
+      uses: requarks/changelog-action@v1
+      with:
+        token: ${{ github.token }}
+        tag: ${{ github.ref_name }}
+    - name: Commit API docs, CHANGELOG.md
+      uses: stefanzweifel/git-auto-commit-action@v4
+      with:
+        branch: main
+        commit_message: 'docs: update API docs, CHANGELOG.md for ${{ github.ref_name }} [skip ci]'
+        file_pattern: 'docs CHANGELOG.md'