Skip to content

Commit 81711de

Browse files
committed
Revert "Use trusted publisher on linux"
This reverts commit d1de69c.
1 parent 89cdde4 commit 81711de

File tree

3 files changed

+39
-20
lines changed

3 files changed

+39
-20
lines changed

.github/workflows/manylinux.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ on: [push]
55
jobs:
66
build_sdist:
77
runs-on: ubuntu-latest
8-
permissions:
9-
id-token: write
108
steps:
119
- uses: actions/checkout@v3
1210
- name: Set up Python
@@ -35,11 +33,13 @@ jobs:
3533
python setup.py sdist
3634
- name: upload to pypi if tagged
3735
if: startsWith(github.ref, 'refs/tags')
38-
uses: pypa/gh-action-pypi-publish@release/v1
36+
env:
37+
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
38+
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
39+
run: |
40+
twine upload dist/mecab*.tar.gz
3941
build_manylinux:
4042
runs-on: ubuntu-latest
41-
permissions:
42-
id-token: write
4343
strategy:
4444
matrix:
4545
arch: [x86_64, aarch64]
@@ -85,5 +85,13 @@ jobs:
8585
path: manylinux-wheels
8686
- name: Publish to PyPI if tagged
8787
if: startsWith(github.ref, 'refs/tags')
88-
uses: pypa/gh-action-pypi-publish@release/v1
88+
env:
89+
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
90+
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
91+
run: |
92+
python --version
93+
pip --version
94+
python -m pip install --upgrade pip
95+
pip install twine setuptools-scm
96+
twine upload manylinux-wheels/mecab*whl
8997

.github/workflows/osx.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ on: [push]
55
jobs:
66
build_osx:
77
runs-on: macos-latest
8-
permissions:
9-
id-token: write
108
strategy:
119
max-parallel: 5
1210
matrix:
13-
python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
11+
python-version: [3.6, 3.7, 3.8, 3.9, "3.10", "3.11"]
1412
include:
13+
- python-version: 3.6
14+
py-short: 36
15+
py-short2: 36m
1516
- python-version: 3.7
1617
py-short: 37
1718
py-short2: 37m
@@ -27,9 +28,6 @@ jobs:
2728
- python-version: "3.11"
2829
py-short: 311
2930
py-short2: 311
30-
- python-version: "3.12"
31-
py-short: 312
32-
py-short2: 312
3331

3432
steps:
3533
- uses: actions/checkout@v3
@@ -77,5 +75,10 @@ jobs:
7775
pip install dist/mecab_python3-${VERSION}-cp${{ matrix.py-short }}-cp${{ matrix.py-short2 }}-macosx*.whl
7876
- name: Publish to PyPI if tagged
7977
if: startsWith(github.ref, 'refs/tags')
80-
uses: pypa/gh-action-pypi-publish@release/v1
78+
env:
79+
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
80+
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
81+
run: |
82+
pip install twine
83+
twine upload dist/mecab*whl
8184

.github/workflows/windows.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ on: [push]
55
jobs:
66
build:
77
runs-on: windows-latest
8-
permissions:
9-
id-token: write
108
strategy:
119
max-parallel: 4
1210
matrix:
13-
python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
11+
python-version: [3.6, 3.7, 3.8, 3.9, "3.10", "3.11"]
1412
include:
13+
- python-version: 3.6
14+
py-short: 36
15+
py-short2: 36m
1516
- python-version: 3.7
1617
py-short: 37
1718
py-short2: 37m
@@ -27,9 +28,6 @@ jobs:
2728
- python-version: "3.11"
2829
py-short: 311
2930
py-short2: 311
30-
- python-version: "3.12"
31-
py-short: 312
32-
py-short2: 312
3331
steps:
3432
- uses: actions/checkout@v3
3533
- name: Set up Python ${{ matrix.python-version }}
@@ -68,4 +66,14 @@ jobs:
6866
pip install "dist/mecab_python3-${VERSION}-cp${{ matrix.py-short }}-cp${{ matrix.py-short2 }}-win_amd64.whl"
6967
- name: Publish to PyPI if tagged
7068
if: startsWith(github.ref, 'refs/tags')
71-
uses: pypa/gh-action-pypi-publish@release/v1
69+
env:
70+
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
71+
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
72+
run: |
73+
python --version
74+
pip --version
75+
python -m pip install --upgrade pip
76+
pip install twine setuptools-scm
77+
twine upload dist/mecab*whl
78+
79+

0 commit comments

Comments
 (0)