Skip to content

Commit 5e3fff8

Browse files
authored
[release-1.34] Release race condition (#9294)
1 parent 3e9bdcb commit 5e3fff8

File tree

1 file changed

+17
-5
lines changed

1 file changed

+17
-5
lines changed

.github/workflows/release.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,18 @@ jobs:
6868
run: |
6969
dapper -f Dockerfile --target dapper make test
7070
71+
- name: Set environment variables
72+
run: |
73+
echo "GIT_TAG=$(echo "${{ github.ref_name }}" | sed -e 's/+/-/g')" >> "$GITHUB_ENV"
74+
7175
- name: Publish Image Runtime
7276
uses: rancher/ecm-distro-tools/actions/publish-image@master
7377
env:
7478
GOARCH: amd64
7579
GOOS: linux
7680
with:
7781
image: "rke2-runtime"
78-
tag: ${{ github.ref_name }}
82+
tag: ${{ env.GIT_TAG }}
7983
make-target: publish-image-runtime
8084

8185
public-repo: rancher
@@ -94,7 +98,7 @@ jobs:
9498
GOOS: linux
9599
with:
96100
image: "rke2-runtime"
97-
tag: ${{ github.ref_name }}
101+
tag: ${{ env.GIT_TAG }}
98102
make-target: publish-image-runtime-windows
99103

100104
public-repo: rancher
@@ -157,14 +161,18 @@ jobs:
157161
run: |
158162
dapper -f Dockerfile --target dapper make scan-images
159163
164+
- name: Set environment variables
165+
run: |
166+
echo "GIT_TAG=$(echo "${{ github.ref_name }}" | sed -e 's/+/-/g')" >> "$GITHUB_ENV"
167+
160168
- name: Publish Image Runtime
161169
uses: rancher/ecm-distro-tools/actions/publish-image@master
162170
env:
163171
GOARCH: arm64
164172
GOOS: linux
165173
with:
166174
image: "rke2-runtime"
167-
tag: ${{ github.ref_name }}
175+
tag: ${{ env.GIT_TAG }}
168176
make-target: publish-image-runtime
169177

170178
public-repo: rancher
@@ -207,14 +215,18 @@ jobs:
207215
secret/data/github/repo/${{ github.repository }}/rancher-prime-registry/credentials username | PRIME_REGISTRY_USERNAME ;
208216
secret/data/github/repo/${{ github.repository }}/rancher-prime-registry/credentials password | PRIME_REGISTRY_PASSWORD ;
209217
218+
- name: Set environment variables
219+
run: |
220+
echo "GIT_TAG=$(echo "${{ github.ref_name }}" | sed -e 's/+/-/g')" >> "$GITHUB_ENV"
221+
210222
- name: Manifest
211223
uses: rancher/ecm-distro-tools/actions/publish-image@master
212224
env:
213225
GOARCH: amd64
214226
GOOS: linux
215227
with:
216228
image: "rke2-runtime"
217-
tag: ${{ github.ref_name }}
229+
tag: ${{ env.GIT_TAG }}
218230
make-target: publish-manifest-runtime
219231

220232
public-repo: rancher
@@ -228,7 +240,7 @@ jobs:
228240

229241
release-downstream-components:
230242
name: "Release downstream components"
231-
needs: [release-amd64, release-arm64]
243+
needs: [release-amd64, release-arm64, sync-prime-ribs]
232244
runs-on: ubuntu-latest
233245
permissions:
234246
contents: read

0 commit comments

Comments
 (0)