From 450ee0f6889f96802511406926e81d367f07e475 Mon Sep 17 00:00:00 2001 From: Jacob Bandes-Storch Date: Wed, 15 Jan 2025 13:52:03 -0800 Subject: [PATCH 1/2] fix pypi publishing --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e15e0439..2edcfe26d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -318,6 +318,7 @@ jobs: packages_dir: python/mcap/dist repository_url: https://test.pypi.org/legacy/ skip_existing: true + attestations: false # https://github.com/pypa/gh-action-pypi-publish/issues/283#issuecomment-2499296440 - name: Publish mcap-protobuf-support to TestPyPI uses: pypa/gh-action-pypi-publish@release/v1 @@ -326,6 +327,7 @@ jobs: repository_url: https://test.pypi.org/legacy/ skip_existing: true packages_dir: python/mcap-protobuf-support/dist + attestations: false # https://github.com/pypa/gh-action-pypi-publish/issues/283#issuecomment-2499296440 - name: Publish mcap-ros1-support to TestPyPI uses: pypa/gh-action-pypi-publish@release/v1 @@ -334,6 +336,7 @@ jobs: repository_url: https://test.pypi.org/legacy/ skip_existing: true packages_dir: python/mcap-ros1-support/dist + attestations: false # https://github.com/pypa/gh-action-pypi-publish/issues/283#issuecomment-2499296440 - name: Publish mcap-ros2-support to TestPyPI uses: pypa/gh-action-pypi-publish@release/v1 @@ -342,6 +345,7 @@ jobs: repository_url: https://test.pypi.org/legacy/ skip_existing: true packages_dir: python/mcap-ros2-support/dist + attestations: false # https://github.com/pypa/gh-action-pypi-publish/issues/283#issuecomment-2499296440 - name: Publish mcap to PyPI if: | From b8adf2924cfcfebc4cb3f30ae059bd7a588f3d04 Mon Sep 17 00:00:00 2001 From: Jacob Bandes-Storch Date: Wed, 15 Jan 2025 13:56:37 -0800 Subject: [PATCH 2/2] fix some deprecations while we're at it --- .github/workflows/ci.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2edcfe26d..a25695852 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -315,36 +315,36 @@ jobs: uses: pypa/gh-action-pypi-publish@release/v1 if: ${{ !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }} with: - packages_dir: python/mcap/dist - repository_url: https://test.pypi.org/legacy/ - skip_existing: true + packages-dir: python/mcap/dist + repository-url: https://test.pypi.org/legacy/ + skip-existing: true attestations: false # https://github.com/pypa/gh-action-pypi-publish/issues/283#issuecomment-2499296440 - name: Publish mcap-protobuf-support to TestPyPI uses: pypa/gh-action-pypi-publish@release/v1 if: ${{ !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }} with: - repository_url: https://test.pypi.org/legacy/ - skip_existing: true - packages_dir: python/mcap-protobuf-support/dist + repository-url: https://test.pypi.org/legacy/ + skip-existing: true + packages-dir: python/mcap-protobuf-support/dist attestations: false # https://github.com/pypa/gh-action-pypi-publish/issues/283#issuecomment-2499296440 - name: Publish mcap-ros1-support to TestPyPI uses: pypa/gh-action-pypi-publish@release/v1 if: ${{ !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }} with: - repository_url: https://test.pypi.org/legacy/ - skip_existing: true - packages_dir: python/mcap-ros1-support/dist + repository-url: https://test.pypi.org/legacy/ + skip-existing: true + packages-dir: python/mcap-ros1-support/dist attestations: false # https://github.com/pypa/gh-action-pypi-publish/issues/283#issuecomment-2499296440 - name: Publish mcap-ros2-support to TestPyPI uses: pypa/gh-action-pypi-publish@release/v1 if: ${{ !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }} with: - repository_url: https://test.pypi.org/legacy/ - skip_existing: true - packages_dir: python/mcap-ros2-support/dist + repository-url: https://test.pypi.org/legacy/ + skip-existing: true + packages-dir: python/mcap-ros2-support/dist attestations: false # https://github.com/pypa/gh-action-pypi-publish/issues/283#issuecomment-2499296440 - name: Publish mcap to PyPI @@ -353,7 +353,7 @@ jobs: startsWith(github.ref, 'refs/tags/releases/python/mcap/v') uses: pypa/gh-action-pypi-publish@release/v1 with: - packages_dir: python/mcap/dist + packages-dir: python/mcap/dist - name: Publish mcap-protobuf-support to PyPI if: | @@ -361,7 +361,7 @@ jobs: startsWith(github.ref, 'refs/tags/releases/python/mcap-protobuf-support/v') uses: pypa/gh-action-pypi-publish@release/v1 with: - packages_dir: python/mcap-protobuf-support/dist + packages-dir: python/mcap-protobuf-support/dist - name: Publish mcap-ros1-support to PyPI if: | @@ -369,7 +369,7 @@ jobs: startsWith(github.ref, 'refs/tags/releases/python/mcap-ros1-support/v') uses: pypa/gh-action-pypi-publish@release/v1 with: - packages_dir: python/mcap-ros1-support/dist + packages-dir: python/mcap-ros1-support/dist - name: Publish mcap-ros2-support to PyPI if: | @@ -377,7 +377,7 @@ jobs: startsWith(github.ref, 'refs/tags/releases/python/mcap-ros2-support/v') uses: pypa/gh-action-pypi-publish@release/v1 with: - packages_dir: python/mcap-ros2-support/dist + packages-dir: python/mcap-ros2-support/dist go: runs-on: ubuntu-latest