From 0a98dcf4dc3cdcf4a704654b426c5f4e6340b1b9 Mon Sep 17 00:00:00 2001
From: BulatVakhitov <vakhitov.bd@gmail.com>
Date: Wed, 24 Jul 2024 09:21:51 +0000
Subject: [PATCH 1/2] fix release

---
 .github/workflows/release-check.yml | 15 +++++++++------
 .github/workflows/release.yml       | 12 +++++++-----
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/release-check.yml b/.github/workflows/release-check.yml
index bdf917391..c6466df74 100644
--- a/.github/workflows/release-check.yml
+++ b/.github/workflows/release-check.yml
@@ -10,6 +10,9 @@ jobs:
   pypi:
 
     runs-on: ubuntu-latest
+    environment: release
+    permissions:
+      id-token: write
 
     steps:
     - uses: actions/checkout@v3
@@ -22,12 +25,12 @@ jobs:
     - name: Install dependencies
       run: pip install --user -U pip poetry
 
-    - name: Build and publish
-      env:
-        _PASSWORD: ${{ secrets.TEST_PYPI_TOKEN }}
+    - name: Build
       run: |
         poetry install
         poetry build
-        poetry config repositories.testpypi https://test.pypi.org/legacy/
-        poetry config pypi-token.testpypi $_PASSWORD
-        poetry publish --repository testpypi
+
+    - name: Publish
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        repository-url: https://test.pypi.org/legacy/
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2355d7d53..7e48ccde4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,6 +30,9 @@ jobs:
 
   pypi:
     runs-on: ubuntu-latest
+    environment: release
+    permissions:
+      id-token: write
 
     steps:
     - uses: actions/checkout@v3
@@ -42,11 +45,10 @@ jobs:
     - name: Install dependencies
       run: pip install --user --upgrade pip poetry
 
-    - name: Build and publish
-      env:
-        _PASSWORD: ${{ secrets.TEST_PYPI_TOKEN }}
+    - name: Build
       run: |
         poetry install
         poetry build
-        poetry config pypi-token.pypi $_PASSWORD
-        poetry publish
+
+    - name: Publish
+      uses: pypa/gh-action-pypi-publish@release/v1
\ No newline at end of file

From f21252f6cd2a45b08100ed66b4a4d1a68634ce6d Mon Sep 17 00:00:00 2001
From: BulatVakhitov <vakhitov.bd@gmail.com>
Date: Fri, 26 Jul 2024 08:14:22 +0000
Subject: [PATCH 2/2] add empty line at the end

---
 .github/workflows/release-check.yml | 2 +-
 .github/workflows/release.yml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release-check.yml b/.github/workflows/release-check.yml
index c6466df74..293f13af0 100644
--- a/.github/workflows/release-check.yml
+++ b/.github/workflows/release-check.yml
@@ -33,4 +33,4 @@ jobs:
     - name: Publish
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
-        repository-url: https://test.pypi.org/legacy/
\ No newline at end of file
+        repository-url: https://test.pypi.org/legacy/
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7e48ccde4..0168c12e6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -51,4 +51,4 @@ jobs:
         poetry build
 
     - name: Publish
-      uses: pypa/gh-action-pypi-publish@release/v1
\ No newline at end of file
+      uses: pypa/gh-action-pypi-publish@release/v1