From 6af53df0750ff171dd1f9209a5911b9d6b43358d Mon Sep 17 00:00:00 2001 From: Daniel Bok Date: Thu, 23 Jan 2025 21:09:50 +0800 Subject: [PATCH 1/3] add workflow dispatch option --- .github/workflows/build.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b3787ce..e3528f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,6 +2,14 @@ name: Build on: workflow_dispatch: + inputs: + branch: + description: 'Branch to build' + required: true + type: choice + options: + - master + - refs/remotes/** push: branches: - develop/* From 894ecb9387330145e9a2e2e1b54812aecd4b412b Mon Sep 17 00:00:00 2001 From: Daniel Bok Date: Thu, 23 Jan 2025 21:32:26 +0800 Subject: [PATCH 2/3] fix twine upload issue --- .github/workflows/build.yml | 4 +++- setup.cfg | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e3528f9..b056b3b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -167,7 +167,9 @@ jobs: path: dist - name: Install twine - run: pip install twine + run: | + pip install twine + pip install -U packaging - name: Move files to top level directory run: | diff --git a/setup.cfg b/setup.cfg index 2f75d3e..f83af33 100644 --- a/setup.cfg +++ b/setup.cfg @@ -34,4 +34,4 @@ classifiers = Topic :: Scientific/Engineering [options] -python_requires = >= 3.8 +python_requires = >= 3.9 From 8389249a7b5f50e0d1cb495b39033fe4a10e0b34 Mon Sep 17 00:00:00 2001 From: Daniel Bok Date: Thu, 23 Jan 2025 22:08:55 +0800 Subject: [PATCH 3/3] use trusted publisher for upload --- .github/workflows/build.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b056b3b..78aaee0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -154,6 +154,9 @@ jobs: name: Deploy packages runs-on: ubuntu-latest needs: test-wheels + permissions: + id-token: write + contents: read steps: - name: Setup Python ${{ matrix.python-version }} @@ -190,14 +193,8 @@ jobs: - name: Upload packages to testpypi if: ${{ !startsWith(github.ref, 'refs/tags/') }} - env: - TWINE_USERNAME: ${{ secrets.PYPI_TEST_TOKEN_NAME }} - TWINE_PASSWORD: ${{ secrets.PYPI_TEST_API_TOKEN }} run: python -m twine upload --skip-existing --repository testpypi dist/* --verbose - name: Upload packages to pypi if: startsWith(github.ref, 'refs/tags/') - env: - TWINE_USERNAME: ${{ secrets.PYPI_PROD_TOKEN_NAME }} - TWINE_PASSWORD: ${{ secrets.PYPI_PROD_API_TOKEN }} run: python -m twine upload --skip-existing dist/* --verbose