From 61182fb8b3f731b9a7632d8e6a037f54a2e0948c Mon Sep 17 00:00:00 2001
From: Egor_P <egor@parity.io>
Date: Fri, 11 Oct 2024 10:30:43 +0200
Subject: [PATCH] [stable2409] Backport docker fix to 2409 (#6021)
This PR backports fix for the docker publishing flow from master:
- https://github.com/paritytech/polkadot-sdk/pull/5896
---
.github/scripts/common/lib.sh | 2 +-
.github/workflows/release-50_publish-docker.yml | 17 +++++++----------
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/.github/scripts/common/lib.sh b/.github/scripts/common/lib.sh
index bea5ae0e7a9..dd10fcbe1e4 100755
--- a/.github/scripts/common/lib.sh
+++ b/.github/scripts/common/lib.sh
@@ -462,7 +462,7 @@ function get_polkadot_node_version_from_code() {
validate_stable_tag() {
tag="$1"
- pattern='^stable[0-9]+(-[0-9]+)?$'
+ pattern="^stable[0-9]{4}(-[0-9]+)?(-rc[0-9]+)?$"
if [[ $tag =~ $pattern ]]; then
echo $tag
diff --git a/.github/workflows/release-50_publish-docker.yml b/.github/workflows/release-50_publish-docker.yml
index 12360d30395..a93f95f15c9 100644
--- a/.github/workflows/release-50_publish-docker.yml
+++ b/.github/workflows/release-50_publish-docker.yml
@@ -86,7 +86,7 @@ jobs:
steps:
- name: Checkout sources
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+ uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- name: Validate inputs
id: validate_inputs
@@ -111,7 +111,7 @@ jobs:
steps:
- name: Checkout sources
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+ uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
#TODO: this step will be needed when automated triggering will work
#this step runs only if the workflow is triggered automatically when new release is published
@@ -134,7 +134,7 @@ jobs:
. ./.github/scripts/common/lib.sh
VERSION="${{ needs.validate-inputs.outputs.VERSION }}"
- if [[ $BINARY == 'polkadot' ]]; then
+ if [[ ${{ inputs.binary }} == 'polkadot' ]]; then
bins=(polkadot polkadot-prepare-worker polkadot-execute-worker)
for bin in "${bins[@]}"; do
fetch_release_artifacts_from_s3 $bin
@@ -166,7 +166,7 @@ jobs:
steps:
- name: Checkout sources
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+ uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- name: Download artifacts
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
@@ -194,15 +194,12 @@ jobs:
run: |
. ./.github/scripts/common/lib.sh
- release="${{ needs.validate-inputs.outputs.VERSION }}" && \
- echo "release=${release}" >> $GITHUB_OUTPUT
+ echo "release=${{ needs.validate-inputs.outputs.stable_tag }}" >> $GITHUB_OUTPUT
commit=$(git rev-parse --short HEAD) && \
echo "commit=${commit}" >> $GITHUB_OUTPUT
- tag=$(git name-rev --tags --name-only $(git rev-parse HEAD)) && \
- [ "${tag}" != "undefined" ] && echo "tag=${tag}" >> $GITHUB_OUTPUT || \
- echo "No tag, doing without"
+ echo "tag=${{ needs.validate-inputs.outputs.version }}" >> $GITHUB_OUTPUT
- name: Fetch release tags
working-directory: release-artifacts
@@ -322,7 +319,7 @@ jobs:
environment: release
steps:
- name: Checkout sources
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+ uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
--
GitLab