From 07dfd9ff770c4693696097d5907b7b9e7de8a0ff Mon Sep 17 00:00:00 2001 From: RalfG Date: Wed, 20 Nov 2024 12:33:30 +0100 Subject: [PATCH 1/5] Test build and publish with testpypi --- .github/workflows/build_and_publish.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_publish.yml b/.github/workflows/build_and_publish.yml index 768ab13..1b2f5e6 100644 --- a/.github/workflows/build_and_publish.yml +++ b/.github/workflows/build_and_publish.yml @@ -3,6 +3,7 @@ name: Build and publish to PyPI on: release: types: [created] + pull_request: jobs: build-sdist: @@ -50,8 +51,8 @@ jobs: needs: [build-sdist, build-wheels] runs-on: ubuntu-latest environment: - name: pypi - url: https://pypi.org/p/ms2pip + name: testpypi + url: https://test.pypi.org/p/ms2pip permissions: id-token: write steps: @@ -61,3 +62,5 @@ jobs: mv wheels-*/*.whl dist/ - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 + with: + repository-url: https://test.pypi.org/legacy/ From 4a3f4c4626114803862f5c4ad36f42f8ad28c76e Mon Sep 17 00:00:00 2001 From: RalfG Date: Wed, 20 Nov 2024 14:41:31 +0100 Subject: [PATCH 2/5] Fix moving artifact wheels --- .github/workflows/build_and_publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_publish.yml b/.github/workflows/build_and_publish.yml index 1b2f5e6..496afb3 100644 --- a/.github/workflows/build_and_publish.yml +++ b/.github/workflows/build_and_publish.yml @@ -59,7 +59,7 @@ jobs: - uses: actions/download-artifact@v4 - name: Move wheels to dist run: | - mv wheels-*/*.whl dist/ + mv dist-*/*.whl dist/ - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: From f0010e3702fc2e8e467a374c53e611bdf705714d Mon Sep 17 00:00:00 2001 From: RalfG Date: Wed, 20 Nov 2024 15:34:53 +0100 Subject: [PATCH 3/5] Fix moving artifact wheels --- .github/workflows/build_and_publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_and_publish.yml b/.github/workflows/build_and_publish.yml index 496afb3..898f49a 100644 --- a/.github/workflows/build_and_publish.yml +++ b/.github/workflows/build_and_publish.yml @@ -59,6 +59,7 @@ jobs: - uses: actions/download-artifact@v4 - name: Move wheels to dist run: | + mkdir dist/ mv dist-*/*.whl dist/ - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 From 72f391abdcabf27c4fca95ab27cc209709d6a404 Mon Sep 17 00:00:00 2001 From: RalfG Date: Wed, 20 Nov 2024 17:12:01 +0100 Subject: [PATCH 4/5] Switch back to production PyPI --- .github/workflows/build_and_publish.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_and_publish.yml b/.github/workflows/build_and_publish.yml index 898f49a..3c8185b 100644 --- a/.github/workflows/build_and_publish.yml +++ b/.github/workflows/build_and_publish.yml @@ -51,8 +51,8 @@ jobs: needs: [build-sdist, build-wheels] runs-on: ubuntu-latest environment: - name: testpypi - url: https://test.pypi.org/p/ms2pip + name: pypi + url: https://pypi.org/p/ms2pip permissions: id-token: write steps: @@ -63,5 +63,3 @@ jobs: mv dist-*/*.whl dist/ - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 - with: - repository-url: https://test.pypi.org/legacy/ From c086a278a6b33784ed04f56bb58ea220d603a3bd Mon Sep 17 00:00:00 2001 From: RalfG Date: Wed, 20 Nov 2024 17:13:01 +0100 Subject: [PATCH 5/5] Remove test PR trigger --- .github/workflows/build_and_publish.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_and_publish.yml b/.github/workflows/build_and_publish.yml index 3c8185b..da1a280 100644 --- a/.github/workflows/build_and_publish.yml +++ b/.github/workflows/build_and_publish.yml @@ -3,7 +3,6 @@ name: Build and publish to PyPI on: release: types: [created] - pull_request: jobs: build-sdist: