From 97f8e61a7dfe753558b0b5588d02de2bdf47f57c Mon Sep 17 00:00:00 2001
From: Tpt <thomaspt@hotmail.fr>
Date: Sun, 19 Mar 2023 13:12:06 +0100
Subject: [PATCH] CI: fixes release artifacts upload

---
 .github/workflows/artifacts.yml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
index 7bf7ad29..6e556c03 100644
--- a/.github/workflows/artifacts.yml
+++ b/.github/workflows/artifacts.yml
@@ -132,7 +132,7 @@ jobs:
         with:
           user: __token__
           password: ${{ secrets.PYPI_PASSWORD }}
-          packages_dir: target/wheels
+          packages-dir: target/wheels
         if: github.event_name == 'release'
 
   wheel_linux_musl:
@@ -160,7 +160,7 @@ jobs:
         with:
           user: __token__
           password: ${{ secrets.PYPI_PASSWORD }}
-          packages_dir: target/wheels
+          packages-dir: target/wheels
         if: github.event_name == 'release'
 
   wheel_mac:
@@ -195,11 +195,10 @@ jobs:
         with:
           name: pyoxigraph_wheel_universal2_mac
           path: target/wheels/*.whl
-      - uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_PASSWORD }}
-          packages_dir: target/wheels
+      - run: pip install twine && twine upload target/wheels/*
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
         if: github.event_name == 'release'
 
   wheel_windows:
@@ -228,11 +227,10 @@ jobs:
         with:
           name: pyoxigraph_wheel_x86_64_windows
           path: target/wheels/*.whl
-      - uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_PASSWORD }}
-          packages_dir: target/wheels
+      - run: pip install twine && twine upload target/wheels/*
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
         if: github.event_name == 'release'
 
   npm_tarball:
@@ -249,6 +247,7 @@ jobs:
           node-version: 16
           cache: npm
           cache-dependency-path: "js/package.json"
+          registry-url: https://registry.npmjs.org
       - run: npm run pack
         working-directory: ./js
       - uses: actions/upload-artifact@v3
@@ -359,7 +358,7 @@ jobs:
         with:
           submodules: true
       - run: |
-          rm -rf .git
+          rm -rf .git bench fuzz
           zip -r oxigraph_${{ github.event.release.tag_name }}.zip .
           tar -czf /tmp/oxigraph_${{ github.event.release.tag_name }}.tar.gz .
           mv /tmp/oxigraph_${{ github.event.release.tag_name }}.tar.gz .