From f56a3fdfa2b6a0cbdd3967bb25f682969b954cad Mon Sep 17 00:00:00 2001
From: scaramallion <scaramallion@users.noreply.github.com>
Date: Sun, 7 Jan 2024 17:46:00 +1100
Subject: [PATCH 1/4] Fix release workflow

---
 .github/workflows/release-deploy.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release-deploy.yml b/.github/workflows/release-deploy.yml
index c1cbe5a..9c9832e 100644
--- a/.github/workflows/release-deploy.yml
+++ b/.github/workflows/release-deploy.yml
@@ -3,6 +3,9 @@ name: release-deploy
 on:
   release:
     types: [ published ]
+  push:
+    branches: [ main ]
+  pull_request:
 
 jobs:
   build_deploy:
@@ -23,11 +26,11 @@ jobs:
 
       run: |
         python -m pip install -U pip
-        python -m pip install twine wheel
+        python -m pip install build
 
     - name: Build wheels and sdist
       run: |
-         python setup.py sdist bdist_wheel
+         python -m build
 
     - uses: actions/upload-artifact@v4
       with:
@@ -47,6 +50,6 @@ jobs:
         with:
           path: dist/
           merge-multiple: true
-
-      - name: Publish package to PyPi
-        uses: pypa/gh-action-pypi-publish@release/v1
+      #
+      # - name: Publish package to PyPi
+      #   uses: pypa/gh-action-pypi-publish@release/v1

From 466c8ea50ae3415dd67384c0f975592ac809018b Mon Sep 17 00:00:00 2001
From: scaramallion <scaramallion@users.noreply.github.com>
Date: Sun, 7 Jan 2024 17:53:22 +1100
Subject: [PATCH 2/4] Update deploy workflow

---
 .github/workflows/release-deploy.yml | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/release-deploy.yml b/.github/workflows/release-deploy.yml
index 9c9832e..7922016 100644
--- a/.github/workflows/release-deploy.yml
+++ b/.github/workflows/release-deploy.yml
@@ -8,8 +8,7 @@ on:
   pull_request:
 
 jobs:
-  build_deploy:
-    name: Build and deploy
+  build-deploy:
     runs-on: ubuntu-latest
 
     steps:
@@ -17,13 +16,12 @@ jobs:
       with:
         submodules: true
 
-    - uses: actions/setup-python@v5
-      name: Install Python
+    - name: Install Python
+      uses: actions/setup-python@v5
       with:
-        python-version: 3.9
-
-    - name: Install requirements
+        python-version: 3.8
 
+    - name: Install required packages
       run: |
         python -m pip install -U pip
         python -m pip install build
@@ -32,7 +30,8 @@ jobs:
       run: |
          python -m build
 
-    - uses: actions/upload-artifact@v4
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v4
       with:
         name: wheels
         path: ./dist
@@ -44,12 +43,9 @@ jobs:
       permissions:
         id-token: write
 
-      steps:
-      - name: Download the wheels
-        uses: actions/download-artifact@v4
-        with:
-          path: dist/
-          merge-multiple: true
+      run: |
+        ls -l dist/
+
       #
       # - name: Publish package to PyPi
       #   uses: pypa/gh-action-pypi-publish@release/v1

From 3ae8624a776dcd22056a53ebf215b8b26c539cdc Mon Sep 17 00:00:00 2001
From: scaramallion <scaramallion@users.noreply.github.com>
Date: Sun, 7 Jan 2024 17:54:23 +1100
Subject: [PATCH 3/4] Update deploy workflow 2

---
 .github/workflows/release-deploy.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release-deploy.yml b/.github/workflows/release-deploy.yml
index 7922016..1244452 100644
--- a/.github/workflows/release-deploy.yml
+++ b/.github/workflows/release-deploy.yml
@@ -10,6 +10,11 @@ on:
 jobs:
   build-deploy:
     runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/project/pylibjpeg/
+    permissions:
+      id-token: write
 
     steps:
     - uses: actions/checkout@v4
@@ -37,12 +42,6 @@ jobs:
         path: ./dist
 
     - name: Publish package to PyPi
-      environment:
-        name: pypi
-        url: https://pypi.org/project/pylibjpeg/
-      permissions:
-        id-token: write
-
       run: |
         ls -l dist/
 

From aec9f806dc121f86fa2db664282a0eabbc0cd734 Mon Sep 17 00:00:00 2001
From: scaramallion <scaramallion@users.noreply.github.com>
Date: Sun, 7 Jan 2024 17:57:39 +1100
Subject: [PATCH 4/4] Finalise

---
 .github/workflows/release-deploy.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/release-deploy.yml b/.github/workflows/release-deploy.yml
index 1244452..c68cfb5 100644
--- a/.github/workflows/release-deploy.yml
+++ b/.github/workflows/release-deploy.yml
@@ -3,9 +3,9 @@ name: release-deploy
 on:
   release:
     types: [ published ]
-  push:
-    branches: [ main ]
-  pull_request:
+  # push:
+  #   branches: [ main ]
+  # pull_request:
 
 jobs:
   build-deploy:
@@ -42,9 +42,4 @@ jobs:
         path: ./dist
 
     - name: Publish package to PyPi
-      run: |
-        ls -l dist/
-
-      #
-      # - name: Publish package to PyPi
-      #   uses: pypa/gh-action-pypi-publish@release/v1
+      uses: pypa/gh-action-pypi-publish@release/v1