Skip to content

Commit 160ce88

Browse files
authored
Set smoke test image tag before workflow branches (#7979)
Resolves #7969
1 parent 1da7d55 commit 160ce88

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

.github/workflows/publish-smoke-test-servlet-images.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,17 @@ on:
1010
workflow_dispatch:
1111

1212
jobs:
13+
prepare:
14+
runs-on: ubuntu-latest
15+
outputs:
16+
tag: ${{ steps.set-tag.outputs.TAG }}
17+
steps:
18+
- id: set-tag
19+
name: Set tag
20+
run: echo "TAG=$(date '+%Y%m%d').$GITHUB_RUN_ID" >> $GITHUB_OUTPUT
21+
1322
publish:
23+
needs: prepare
1424
runs-on: ${{ matrix.os }}
1525
defaults:
1626
run:
@@ -52,9 +62,6 @@ jobs:
5262
username: ${{ github.repository_owner }}
5363
password: ${{ secrets.GITHUB_TOKEN }}
5464

55-
- name: Set tag
56-
run: echo "TAG=$(date '+%Y%m%d').$GITHUB_RUN_ID" >> $GITHUB_ENV
57-
5865
- name: Set up Gradle cache
5966
uses: gradle/gradle-build-action@v2
6067
with:
@@ -63,11 +70,11 @@ jobs:
6370

6471
- name: Build Linux docker images
6572
if: matrix.os != 'windows-latest'
66-
run: ./gradlew :smoke-tests:images:servlet:buildLinuxTestImages pushMatrix -PextraTag=${{ env.TAG }} -PsmokeTestServer=${{ matrix.smoke-test-server }}
73+
run: ./gradlew :smoke-tests:images:servlet:buildLinuxTestImages pushMatrix -PextraTag=${{ needs.prepare.outputs.tag }} -PsmokeTestServer=${{ matrix.smoke-test-server }}
6774

6875
- name: Build Windows docker images
6976
if: matrix.os == 'windows-latest'
70-
run: ./gradlew :smoke-tests:images:servlet:buildWindowsTestImages pushMatrix -PextraTag=${{ env.TAG }} -PsmokeTestServer=${{ matrix.smoke-test-server }}
77+
run: ./gradlew :smoke-tests:images:servlet:buildWindowsTestImages pushMatrix -PextraTag=${{ needs.prepare.outputs.tag }} -PsmokeTestServer=${{ matrix.smoke-test-server }}
7178

7279
open-issue-on-failure:
7380
needs:

0 commit comments

Comments
 (0)