From 39caa9d5048baef79d9ab8bcb3b59cb900fe6fe1 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Mon, 18 Mar 2024 12:58:35 +0100 Subject: [PATCH 01/13] build: Get Read the Docs release number from Cargo manifest This avoids hardcoding the release number in the documentation build config, making it easier to bump the version by only modifying the manifest. --- docs/conf.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 466644c1..f31c384e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -23,6 +23,8 @@ # -- Project setup -------------------------------------------------------------- +import tomllib + import zenoh # -- Project information ----------------------------------------------------- @@ -31,8 +33,9 @@ copyright = '2020, ZettaScale Zenoh team, ' author = 'ZettaScale Zenoh team, ' -# The full version, including alpha/beta/rc tags -release = '0.11.0-dev' +# Extract the release number from the Cargo manifest +with open("../Cargo.toml", "rb") as f: + release = tomllib.load(f)["package"]["version"] # -- General configuration --------------------------------------------------- From 64a786ced874eba2d57daa5278b934dc5b2432cd Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Mon, 18 Mar 2024 13:26:54 +0100 Subject: [PATCH 02/13] build: Require Python 3.11 in Read the Docs configuration Python 3.11 is needed to access tomllib; useful for parsing the Cargo manifest file. --- .readthedocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 30b8ac3d..5ed51ef2 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -26,7 +26,7 @@ sphinx: build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.11" rust: "latest" jobs: pre_build: From 089771a0c46ed16348e0e693491e28ad03a9e7e8 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Mon, 18 Mar 2024 14:28:28 +0100 Subject: [PATCH 03/13] feat: Create branch, bump version and tag in release workflow --- .github/workflows/release.yml | 48 ++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 490811ca..24c327fd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,14 +1,36 @@ name: Release on: - release: - types: [published] schedule: - cron: "0 1 * * 1-5" workflow_dispatch: + inputs: + live-run: + type: boolean + description: If false (or undefined) the workflow runs in dry-run mode (i.e. with no side-effects) + required: false + version: + type: string + description: Release number. If undefined, the workflow auto-generates a version using git-describe + required: false + zenoh-version: + type: string + description: Release number of Zenoh. Required in live-run mode and ignored in dry-run mode + required: false jobs: - macos: + tag: + name: Bump and tag crates + uses: eclipse-zenoh/ci/.github/workflows/tag-crates.yml@main + with: + repo: ${{ github.repository }} + live-run: ${{ inputs.live-run || false }} + version: ${{ inputs.version }} + inter-deps-pattern: ${{ inputs.live-run && 'zenoh.*' || '^$' }} + inter-deps-version: ${{ inputs.live-run && inputs.zenoh-version || '' }} + secrets: inherit + + build-macos: runs-on: macos-latest steps: - name: Checkout this repository @@ -36,7 +58,7 @@ jobs: name: wheels path: dist - windows: + build-windows: runs-on: windows-latest strategy: matrix: @@ -63,7 +85,7 @@ jobs: name: wheels path: dist - linux: + build-linux: runs-on: ubuntu-latest strategy: matrix: @@ -85,7 +107,7 @@ jobs: name: wheels path: dist - linux-aarch64: + build-linux-aarch64: runs-on: ubuntu-latest steps: - name: Checkout this repository @@ -110,7 +132,7 @@ jobs: name: wheels path: dist - linux-armv6: + build-linux-armv6: runs-on: macos-latest steps: - name: Checkout this repository @@ -121,7 +143,7 @@ jobs: rustup set profile minimal rustup target add arm-unknown-linux-gnueabihf - - name: install cross toolchain + - name: Install cross toolchain run: | brew tap messense/macos-cross-toolchains brew install arm-unknown-linux-gnueabihf @@ -141,18 +163,20 @@ jobs: path: dist deploy-wheels: - needs: [macos, windows, linux, linux-armv6] - name: deploy wheels to pypi + needs: [build-macos, build-windows, build-linux, build-linux-armv6] + name: Deploy wheels to pypi runs-on: ubuntu-latest steps: - uses: actions/download-artifact@v3 with: name: wheels path: dist + - name: Check dist run: ls -al ./dist/* - - name: publish - if: github.event_name == 'release' && github.event.action == 'published' + + - name: Publish + if: ${{ inputs.live-run || false }} uses: pypa/gh-action-pypi-publish@v1.6.4 with: password: ${{ secrets.PYPI_ORG_TOKEN }} From c0a748f48a65b41423805ffdfad95ebf37b3dc36 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Wed, 17 Apr 2024 11:07:57 +0200 Subject: [PATCH 04/13] feat: Add publish-github job --- .github/workflows/release.yml | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 24c327fd..e4ee31b4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,27 +7,28 @@ on: inputs: live-run: type: boolean - description: If false (or undefined) the workflow runs in dry-run mode (i.e. with no side-effects) + description: Live-run required: false version: type: string - description: Release number. If undefined, the workflow auto-generates a version using git-describe + description: Release number required: false zenoh-version: type: string - description: Release number of Zenoh. Required in live-run mode and ignored in dry-run mode + description: Release number of Zenoh required: false jobs: tag: name: Bump and tag crates - uses: eclipse-zenoh/ci/.github/workflows/tag-crates.yml@main + uses: eclipse-zenoh/ci/.github/workflows/branch-bump-tag-crates.yml@main with: repo: ${{ github.repository }} live-run: ${{ inputs.live-run || false }} version: ${{ inputs.version }} - inter-deps-pattern: ${{ inputs.live-run && 'zenoh.*' || '^$' }} - inter-deps-version: ${{ inputs.live-run && inputs.zenoh-version || '' }} + bump-deps-version: ${{ inputs.zenoh-version }} + bump-deps-pattern: ${{ inputs.zenoh-version && 'zenoh.*' || '^$' }} + bump-deps-branch: ${{ inputs.zenoh-version && format('release/{0}', inputs.zenoh-version) || '' }} secrets: inherit build-macos: @@ -162,7 +163,7 @@ jobs: name: wheels path: dist - deploy-wheels: + publish-pypi: needs: [build-macos, build-windows, build-linux, build-linux-armv6] name: Deploy wheels to pypi runs-on: ubuntu-latest @@ -180,3 +181,16 @@ jobs: uses: pypa/gh-action-pypi-publish@v1.6.4 with: password: ${{ secrets.PYPI_ORG_TOKEN }} + + publish-github: + needs: tag + runs-on: ubuntu-latest + steps: + - uses: eclipse-zenoh/ci/publish-crates-github@main + with: + repo: ${{ github.repository }} + live-run: ${{ inputs.live-run || false }} + version: ${{ needs.tag.outputs.version }} + branch: ${{ needs.tag.outputs.branch }} + github-token: ${{ secrets.BOT_TOKEN_WORKFLOW }} + archive-patterns: "^$" From b7fc881661eb57c8b7f3653e3687a9b6f623fbb8 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Wed, 17 Apr 2024 11:16:22 +0200 Subject: [PATCH 05/13] fix: Broken tag dependencies --- .github/workflows/release.yml | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e4ee31b4..165c1115 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,6 +32,7 @@ jobs: secrets: inherit build-macos: + needs: tag runs-on: macos-latest steps: - name: Checkout this repository @@ -60,6 +61,7 @@ jobs: path: dist build-windows: + needs: tag runs-on: windows-latest strategy: matrix: @@ -87,6 +89,7 @@ jobs: path: dist build-linux: + needs: tag runs-on: ubuntu-latest strategy: matrix: @@ -109,6 +112,7 @@ jobs: path: dist build-linux-aarch64: + needs: tag runs-on: ubuntu-latest steps: - name: Checkout this repository @@ -134,6 +138,7 @@ jobs: path: dist build-linux-armv6: + needs: tag runs-on: macos-latest steps: - name: Checkout this repository @@ -164,7 +169,15 @@ jobs: path: dist publish-pypi: - needs: [build-macos, build-windows, build-linux, build-linux-armv6] + needs: + [ + tag, + build-macos, + build-windows, + build-linux, + build-linux-armv6, + build-linux-aarch64, + ] name: Deploy wheels to pypi runs-on: ubuntu-latest steps: @@ -183,7 +196,15 @@ jobs: password: ${{ secrets.PYPI_ORG_TOKEN }} publish-github: - needs: tag + needs: + [ + tag, + build-macos, + build-windows, + build-linux, + build-linux-armv6, + build-linux-aarch64, + ] runs-on: ubuntu-latest steps: - uses: eclipse-zenoh/ci/publish-crates-github@main From ef5df8ec304072cd546d18d0e018309f4ce7b984 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Wed, 17 Apr 2024 11:17:48 +0200 Subject: [PATCH 06/13] chore: Remove enforce-linking-issues workflow --- .github/workflows/enforce-linking-issues.yml | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 .github/workflows/enforce-linking-issues.yml diff --git a/.github/workflows/enforce-linking-issues.yml b/.github/workflows/enforce-linking-issues.yml deleted file mode 100644 index ebeddd9e..00000000 --- a/.github/workflows/enforce-linking-issues.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: Enforce linking issues - -on: - pull_request_target: - types: [opened, edited, labeled] - -jobs: - main: - uses: eclipse-zenoh/zenoh/.github/workflows/enforce-linking-issues.yml@main - secrets: inherit From 7823c22a4c2c166a5dbfb2dfbcb202d513047476 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Wed, 17 Apr 2024 12:58:52 +0200 Subject: [PATCH 07/13] fix: Bump version in pyproject.toml --- .github/workflows/release.yml | 39 +++++++++++++++------ ci/scripts/bump-and-tag.bash | 66 +++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 10 deletions(-) create mode 100644 ci/scripts/bump-and-tag.bash diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 165c1115..eec1c03d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,16 +20,35 @@ on: jobs: tag: - name: Bump and tag crates - uses: eclipse-zenoh/ci/.github/workflows/branch-bump-tag-crates.yml@main - with: - repo: ${{ github.repository }} - live-run: ${{ inputs.live-run || false }} - version: ${{ inputs.version }} - bump-deps-version: ${{ inputs.zenoh-version }} - bump-deps-pattern: ${{ inputs.zenoh-version && 'zenoh.*' || '^$' }} - bump-deps-branch: ${{ inputs.zenoh-version && format('release/{0}', inputs.zenoh-version) || '' }} - secrets: inherit + name: Branch, Bump & tag + runs-on: ubuntu-latest + outputs: + version: ${{ steps.create-release-branch.outputs.version }} + branch: ${{ steps.create-release-branch.outputs.branch }} + steps: + - id: create-release-branch + uses: eclipse-zenoh/ci/create-release-branch@main + with: + repo: ${{ github.repository }} + live-run: ${{ inputs.live-run || false }} + version: ${{ inputs.version }} + github-token: ${{ secrets.BOT_TOKEN_WORKFLOW }} + + - name: Checkout this repository + uses: actions/checkout@v4 + with: + ref: ${{ steps.create-release-branch.outputs.branch }} + token: ${{ secrets.BOT_TOKEN_WORKFLOW }} + + - name: Bump and tag project + run: bash ci/scripts/bump-and-tag.bash + env: + VERSION: ${{ steps.create-release-branch.outputs.version }} + BUMP_DEPS_VERSION: ${{ inputs.zenoh-version }} + BUMP_DEPS_PATTERN: ${{ inputs.zenoh-version && 'zenoh.*' || '' }} + BUMP_DEPS_BRANCH: ${{ inputs.zenoh-version && format('release/{0}', inputs.zenoh-version) || '' }} + GIT_USER_NAME: eclipse-zenoh-bot + GIT_USER_EMAIL: eclipse-zenoh-bot@users.noreply.github.com build-macos: needs: tag diff --git a/ci/scripts/bump-and-tag.bash b/ci/scripts/bump-and-tag.bash new file mode 100644 index 00000000..301eaf17 --- /dev/null +++ b/ci/scripts/bump-and-tag.bash @@ -0,0 +1,66 @@ +#!/usr/bin/env bash + +set -xeo pipefail + +# Release number +readonly version=${VERSION:?input VERSION is required} +# Dependencies' pattern +readonly bump_deps_pattern=${BUMP_DEPS_PATTERN:-''} +# Dependencies' version +readonly bump_deps_version=${BUMP_DEPS_VERSION:-''} +# Dependencies' git branch +readonly bump_deps_branch=${BUMP_DEPS_BRANCH:-''} +# Git actor name +readonly git_user_name=${GIT_USER_NAME:?input GIT_USER_NAME is required} +# Git actor email +readonly git_user_email=${GIT_USER_EMAIL:?input GIT_USER_EMAIL is required} + +cargo +stable install toml-cli + +# NOTE(fuzzypixelz): toml-cli doesn't yet support in-place modification +# See: https://github.com/gnprice/toml-cli?tab=readme-ov-file#writing-ish-toml-set +function toml_set_in_place() { + local tmp=$(mktemp) + toml set "$1" "$2" "$3" > "$tmp" + mv "$tmp" "$1" +} + +export GIT_AUTHOR_NAME=$git_user_name +export GIT_AUTHOR_EMAIL=$git_user_email +export GIT_COMMITTER_NAME=$git_user_name +export GIT_COMMITTER_EMAIL=$git_user_email + +# Bump Cargo version +toml_set_in_place Cargo.toml "package.version" "$version" +# Propagate version change to pyproject.toml +toml_set_in_place pyproject.toml "project.version" "$version" + +git commit version.txt Cargo.toml pyproject.toml -m "chore: Bump version to $version" + +# Select all package dependencies that match $bump_deps_pattern and bump them to $bump_deps_version +if [[ "$bump_deps_pattern" != '' ]]; then + deps=$(toml get Cargo.toml dependencies | jq -r "keys.[] | select(test(\"$bump_deps_pattern\"))") + for dep in $deps; do + if [[ -n $bump_deps_version ]]; then + toml_set_in_place Cargo.toml "dependencies.$dep.version" "$bump_deps_version" + fi + + if [[ -n $bump_deps_branch ]]; then + toml_set_in_place Cargo.toml "dependencies.$dep.branch" "$bump_deps_branch" + fi + done + # Update lockfile + cargo check + + if [[ -n $bump_deps_version || -n $bump_deps_branch ]]; then + git commit Cargo.toml Cargo.lock -m "chore: Bump $bump_deps_pattern version to $bump_deps_version" + else + echo "warn: no changes have been made to any dependencies matching $bump_deps_pattern" + fi +fi + +git tag --force "$version" -m "v$version" +git log -10 +git show-ref --tags +git push origin +git push --force origin "$version" From a53597122f681514d2951c2e2a263f82e826d69c Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Wed, 17 Apr 2024 13:00:01 +0200 Subject: [PATCH 08/13] chore: Upgrade artifact actions from v3 to v4 --- .github/workflows/release.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eec1c03d..71b339f6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -74,7 +74,7 @@ jobs: args: --release --universal2 --out dist - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: wheels path: dist @@ -102,7 +102,7 @@ jobs: args: --release --out dist - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: wheels path: dist @@ -125,7 +125,7 @@ jobs: args: --release --out dist - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: wheels path: dist @@ -151,7 +151,7 @@ jobs: args: --release --out dist - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: wheels path: dist @@ -182,7 +182,7 @@ jobs: maturin build --release --target arm-unknown-linux-gnueabihf --out dist - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: wheels path: dist @@ -200,7 +200,7 @@ jobs: name: Deploy wheels to pypi runs-on: ubuntu-latest steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: wheels path: dist From 36a047e1f5672cfa8d3cc1b4a270e22eb03e890c Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Wed, 17 Apr 2024 13:10:53 +0200 Subject: [PATCH 09/13] fix: Typo in git-commit command --- ci/scripts/bump-and-tag.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/scripts/bump-and-tag.bash b/ci/scripts/bump-and-tag.bash index 301eaf17..3202b808 100644 --- a/ci/scripts/bump-and-tag.bash +++ b/ci/scripts/bump-and-tag.bash @@ -35,7 +35,7 @@ toml_set_in_place Cargo.toml "package.version" "$version" # Propagate version change to pyproject.toml toml_set_in_place pyproject.toml "project.version" "$version" -git commit version.txt Cargo.toml pyproject.toml -m "chore: Bump version to $version" +git commit Cargo.toml pyproject.toml -m "chore: Bump version to $version" # Select all package dependencies that match $bump_deps_pattern and bump them to $bump_deps_version if [[ "$bump_deps_pattern" != '' ]]; then From 3d3a153184e3ef273e95fd962287b732acb59ac6 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Wed, 17 Apr 2024 13:41:16 +0200 Subject: [PATCH 10/13] fix: Support jq 1.6 ubuntu-22.04 runners use jq 1.6 which doesn't recognize a dot for `[]` value iterator. See: https://github.com/jqlang/jq/issues/1168. --- ci/scripts/bump-and-tag.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/scripts/bump-and-tag.bash b/ci/scripts/bump-and-tag.bash index 3202b808..a883352c 100644 --- a/ci/scripts/bump-and-tag.bash +++ b/ci/scripts/bump-and-tag.bash @@ -39,7 +39,7 @@ git commit Cargo.toml pyproject.toml -m "chore: Bump version to $version" # Select all package dependencies that match $bump_deps_pattern and bump them to $bump_deps_version if [[ "$bump_deps_pattern" != '' ]]; then - deps=$(toml get Cargo.toml dependencies | jq -r "keys.[] | select(test(\"$bump_deps_pattern\"))") + deps=$(toml get Cargo.toml dependencies | jq -r "keys[] | select(test(\"$bump_deps_pattern\"))") for dep in $deps; do if [[ -n $bump_deps_version ]]; then toml_set_in_place Cargo.toml "dependencies.$dep.version" "$bump_deps_version" From 77dab5e84ce2fcb4b282ad7e1b7a3b78dc8e1cbe Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Wed, 17 Apr 2024 13:58:39 +0200 Subject: [PATCH 11/13] Revert "chore: Upgrade artifact actions from v3 to v4" This reverts commit a53597122f681514d2951c2e2a263f82e826d69c. --- .github/workflows/release.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 71b339f6..eec1c03d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -74,7 +74,7 @@ jobs: args: --release --universal2 --out dist - name: Upload wheels - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: wheels path: dist @@ -102,7 +102,7 @@ jobs: args: --release --out dist - name: Upload wheels - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: wheels path: dist @@ -125,7 +125,7 @@ jobs: args: --release --out dist - name: Upload wheels - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: wheels path: dist @@ -151,7 +151,7 @@ jobs: args: --release --out dist - name: Upload wheels - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: wheels path: dist @@ -182,7 +182,7 @@ jobs: maturin build --release --target arm-unknown-linux-gnueabihf --out dist - name: Upload wheels - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: wheels path: dist @@ -200,7 +200,7 @@ jobs: name: Deploy wheels to pypi runs-on: ubuntu-latest steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v3 with: name: wheels path: dist From 33bbbcc8c6d92e471a612ea927fdaff50baab1b5 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Wed, 17 Apr 2024 14:32:23 +0200 Subject: [PATCH 12/13] fix: Build wheels from release branch --- .github/workflows/release.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eec1c03d..c5459165 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,6 @@ jobs: uses: actions/checkout@v4 with: ref: ${{ steps.create-release-branch.outputs.branch }} - token: ${{ secrets.BOT_TOKEN_WORKFLOW }} - name: Bump and tag project run: bash ci/scripts/bump-and-tag.bash @@ -56,6 +55,8 @@ jobs: steps: - name: Checkout this repository uses: actions/checkout@v4 + with: + ref: ${{ needs.tag.outputs.branch }} - name: Install Rust toolchain run: | @@ -89,6 +90,8 @@ jobs: steps: - name: Checkout this repository uses: actions/checkout@v4 + with: + ref: ${{ needs.tag.outputs.branch }} - name: Install Rust toolchain run: | @@ -116,6 +119,8 @@ jobs: steps: - name: Checkout this repository uses: actions/checkout@v4 + with: + ref: ${{ needs.tag.outputs.branch }} - name: Build wheels uses: messense/maturin-action@v1 @@ -136,6 +141,8 @@ jobs: steps: - name: Checkout this repository uses: actions/checkout@v4 + with: + ref: ${{ needs.tag.outputs.branch }} - name: Build wheels uses: messense/maturin-action@v1 @@ -162,6 +169,8 @@ jobs: steps: - name: Checkout this repository uses: actions/checkout@v4 + with: + ref: ${{ needs.tag.outputs.branch }} - name: Install Rust toolchain run: | From 4b1c5f10da2b132ff8085439f0bed1a35d120b70 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Wed, 17 Apr 2024 14:59:10 +0200 Subject: [PATCH 13/13] fix: Switch to pypa/gh-action-pypi-publish@release/v1 The older actions doesn't recognize the pyproject.toml metadata fields. --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c5459165..69098a19 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -219,7 +219,7 @@ jobs: - name: Publish if: ${{ inputs.live-run || false }} - uses: pypa/gh-action-pypi-publish@v1.6.4 + uses: pypa/gh-action-pypi-publish@release/v1 with: password: ${{ secrets.PYPI_ORG_TOKEN }}