From 1100c1843ee60f2011400febd9f588463087ad8e Mon Sep 17 00:00:00 2001
From: Egor_P <egor@parity.io>
Date: Thu, 7 Nov 2024 12:59:26 +0100
Subject: [PATCH] [Release|CI/CD] Add node version to deb package version
(#6399)
This PR has small addition to the db package version. As `cargodeb`
takes the version from the `*.toml` file, this PR adds an extra flag to
the `cargodeb` command so that the version of the deb package matches
the `polkadot` node version.
---
.github/scripts/release/build-deb.sh | 3 +--
.github/workflows/release-reusable-rc-buid.yml | 4 +++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.github/scripts/release/build-deb.sh b/.github/scripts/release/build-deb.sh
index 6cb833f98a4..8dce621bb4d 100755
--- a/.github/scripts/release/build-deb.sh
+++ b/.github/scripts/release/build-deb.sh
@@ -9,8 +9,7 @@ cargo install --version 2.7.0 cargo-deb --locked -q
echo "Using cargo-deb v$(cargo-deb --version)"
echo "Building a Debian package for '$PRODUCT' in '$PROFILE' profile"
-# we need to start the custom version with a didgit as requires it cargo-deb
-cargo deb --profile $PROFILE --no-strip --no-build -p $PRODUCT --deb-version 1-$VERSION
+cargo deb --profile $PROFILE --no-strip --no-build -p $PRODUCT --deb-version $VERSION
deb=target/debian/$PRODUCT_*_amd64.deb
diff --git a/.github/workflows/release-reusable-rc-buid.yml b/.github/workflows/release-reusable-rc-buid.yml
index d76f36e95c8..d925839fb84 100644
--- a/.github/workflows/release-reusable-rc-buid.yml
+++ b/.github/workflows/release-reusable-rc-buid.yml
@@ -151,7 +151,9 @@ jobs:
- name: Build polkadot deb package
shell: bash
run: |
- . "${GITHUB_WORKSPACE}"/.github/scripts/release/build-deb.sh ${{ inputs.package }} ${{ inputs.release_tag }}
+ . "${GITHUB_WORKSPACE}"/.github/scripts/common/lib.sh
+ VERSION=$(get_polkadot_node_version_from_code)
+ . "${GITHUB_WORKSPACE}"/.github/scripts/release/build-deb.sh ${{ inputs.package }} ${VERSION}
- name: Generate artifact attestation
uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
--
GitLab