From b5c0a8fd6d76bf88e8c9506e7535a66a057fb72f Mon Sep 17 00:00:00 2001
From: Claas <claas.rostock@dnv.com>
Date: Thu, 14 Nov 2024 12:37:10 +0100
Subject: [PATCH] .github/workflows/publish_release.yml : Run publishing job
 from main (non-reusable) workflow. Left the publishing job commented out,
 though (it was disabled also before).  Remove the reusable workflow
 _publish_package.yml.disabled.

---
 .../workflows/_publish_package.yml.disabled   | 22 -------------------
 .github/workflows/publish_release.yml         | 16 +++++++++++---
 2 files changed, 13 insertions(+), 25 deletions(-)
 delete mode 100644 .github/workflows/_publish_package.yml.disabled

diff --git a/.github/workflows/_publish_package.yml.disabled b/.github/workflows/_publish_package.yml.disabled
deleted file mode 100644
index fe0b5b6..0000000
--- a/.github/workflows/_publish_package.yml.disabled
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Publish Package to pypi
-
-on:
-  workflow_call:
-    secrets:
-      PYPI_API_TOKEN:
-        required: true
-
-jobs:
-  publish:
-    name: Publish package
-    runs-on: ubuntu-latest
-    environment: pypi
-    steps:
-      - uses: actions/download-artifact@v3
-        with:
-          name: artifact
-          path: ./dist/
-      - uses: pypa/gh-action-pypi-publish@v1.5.2
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
index faffd92..2275117 100644
--- a/.github/workflows/publish_release.yml
+++ b/.github/workflows/publish_release.yml
@@ -14,11 +14,21 @@ jobs:
   #     - requirements_files
   #   uses: ./.github/workflows/_build_package.yml
   # publish_package:
+  #   name: Publish package
   #   needs:
   #     - build_package
-  #   uses: ./.github/workflows/_publish_package.yml
-  #   secrets:
-  #     PYPI_API_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
+  #   runs-on: ubuntu-latest
+  #   environment: release
+  #   permissions:
+  #     id-token: write
+  #   steps:
+  #     - uses: actions/download-artifact@v4
+  #       with:
+  #         name: artifact
+  #         path: dist
+  #     - uses: pypa/gh-action-pypi-publish@release/v1
+  #       # with:                                             # Uncomment this line to publish to testpypi
+  #       #   repository-url: https://test.pypi.org/legacy/   # Uncomment this line to publish to testpypi
   merge_into_release:
     uses: ./.github/workflows/_merge_into_release.yml
     secrets: