From e478669b8020c8cb57f208a404327b57dc7e8836 Mon Sep 17 00:00:00 2001
From: ElieTaillard <taillardelie@gmail.com>
Date: Thu, 25 Apr 2024 19:40:22 +0200
Subject: [PATCH] Fix PyPI pipelines

---
 .github/workflows/publish_pypi.yml          | 13 +++++++------
 .github/workflows/publish_pypi_manually.yml |  7 ++++++-
 .github/workflows/release.yml               |  2 ++
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml
index feb932dd..ca87c77e 100644
--- a/.github/workflows/publish_pypi.yml
+++ b/.github/workflows/publish_pypi.yml
@@ -1,19 +1,20 @@
-# This workflow will upload a Python Package using Twine when a release is created
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python#publishing-to-package-registries
-
 name: Publish Python Package
 
 on:
   workflow_call:
+    secrets:
+      PYPI_API_TOKEN:
+        required: true
 
 permissions:
   contents: read
-  id-token: write
 
 jobs:
   build-and-pypi-publish:
-
     runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/ikabot
 
     steps:
     - uses: actions/checkout@v3
@@ -32,7 +33,7 @@ jobs:
       run: python -m build
 
     - name: Publish package
-      uses: pypa/gh-action-pypi-publish@release/v1.8
+      uses: pypa/gh-action-pypi-publish@release/v1
       with:
         user: __token__
         password: ${{ secrets.PYPI_API_TOKEN }}
diff --git a/.github/workflows/publish_pypi_manually.yml b/.github/workflows/publish_pypi_manually.yml
index 6c67d8d8..1b15ac50 100644
--- a/.github/workflows/publish_pypi_manually.yml
+++ b/.github/workflows/publish_pypi_manually.yml
@@ -3,7 +3,12 @@ name: Publish PyPI package Manually
 on:
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   publish_pypi:
     name: Publish PyPI package
-    uses: ./.github/workflows/publish_pypi.yml
\ No newline at end of file
+    uses: ./.github/workflows/publish_pypi.yml
+    secrets:
+      PYPI_API_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index efca5f1f..17e47efa 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -141,3 +141,5 @@ jobs:
     needs: [publish_release]
     name: Publish Python Package
     uses: ./.github/workflows/publish_pypi.yml
+    secrets:
+      PYPI_API_TOKEN: ${{ secrets.PYPI_API_TOKEN }}