Revert "Use trusted publisher on linux"

This reverts commit d1de69c.
SamuraiT · Sep 14, 2023 · 81711de · 81711de
1 parent 89cdde4
commit 81711de
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 20 deletions.
diff --git a/.github/workflows/manylinux.yml b/.github/workflows/manylinux.yml
@@ -5,8 +5,6 @@ on: [push]
 jobs:
   build_sdist:
     runs-on: ubuntu-latest
-    permissions:
-      id-token: write
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python
@@ -35,11 +33,13 @@ jobs:
         python setup.py sdist
     - name: upload to pypi if tagged
       if: startsWith(github.ref, 'refs/tags')
-      uses:  pypa/gh-action-pypi-publish@release/v1
+      env:
+        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+      run: |
+        twine upload dist/mecab*.tar.gz
   build_manylinux:
     runs-on: ubuntu-latest
-    permissions:
-      id-token: write
     strategy:
       matrix:
         arch: [x86_64, aarch64]
@@ -85,5 +85,13 @@ jobs:
         path: manylinux-wheels
     - name: Publish to PyPI if tagged
       if: startsWith(github.ref, 'refs/tags')
-      uses:  pypa/gh-action-pypi-publish@release/v1
+      env:
+        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+      run: |
+        python --version
+        pip --version
+        python -m pip install --upgrade pip
+        pip install twine setuptools-scm
+        twine upload manylinux-wheels/mecab*whl
 
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
@@ -5,13 +5,14 @@ on: [push]
 jobs:
   build_osx:
     runs-on: macos-latest
-    permissions:
-      id-token: write
     strategy:
       max-parallel: 5
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
+        python-version: [3.6, 3.7, 3.8, 3.9, "3.10", "3.11"]
         include:
+          - python-version: 3.6
+            py-short: 36
+            py-short2: 36m
           - python-version: 3.7
             py-short: 37
             py-short2: 37m
@@ -27,9 +28,6 @@ jobs:
           - python-version: "3.11"
             py-short: 311
             py-short2: 311
-          - python-version: "3.12"
-            py-short: 312
-            py-short2: 312
 
     steps:
     - uses: actions/checkout@v3
@@ -77,5 +75,10 @@ jobs:
         pip install dist/mecab_python3-${VERSION}-cp${{ matrix.py-short }}-cp${{ matrix.py-short2 }}-macosx*.whl
     - name: Publish to PyPI if tagged
       if: startsWith(github.ref, 'refs/tags')
-      uses:  pypa/gh-action-pypi-publish@release/v1
+      env:
+        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+      run: |
+        pip install twine
+        twine upload dist/mecab*whl
 
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -5,13 +5,14 @@ on: [push]
 jobs:
   build:
     runs-on: windows-latest
-    permissions:
-      id-token: write
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
+        python-version: [3.6, 3.7, 3.8, 3.9, "3.10", "3.11"]
         include:
+          - python-version: 3.6
+            py-short: 36
+            py-short2: 36m
           - python-version: 3.7
             py-short: 37
             py-short2: 37m
@@ -27,9 +28,6 @@ jobs:
           - python-version: "3.11"
             py-short: 311
             py-short2: 311
-          - python-version: "3.12"
-            py-short: 312
-            py-short2: 312
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
@@ -68,4 +66,14 @@ jobs:
         pip install "dist/mecab_python3-${VERSION}-cp${{ matrix.py-short }}-cp${{ matrix.py-short2 }}-win_amd64.whl"
     - name: Publish to PyPI if tagged
       if: startsWith(github.ref, 'refs/tags')
-      uses:  pypa/gh-action-pypi-publish@release/v1
+      env:
+        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+      run: |
+        python --version
+        pip --version
+        python -m pip install --upgrade pip
+        pip install twine setuptools-scm
+        twine upload dist/mecab*whl
+
+