Skip to content

Commit 3a06f81

Browse files
committed
Fix wrong target version for mainline
It should follow current version (e.g. v1.18) Signed-off-by: Kentaro Hayashi <[email protected]>
1 parent 338c2b5 commit 3a06f81

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/workflows/check-build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ jobs:
5252
run: |
5353
set -x
5454
component=${{ matrix.component }}
55-
echo "CONTEXT=docker-image/v1.17/${component}" >> ${GITHUB_ENV}
55+
branch=$(make echo-all-images | cut -d '/' -f1)
56+
echo "CONTEXT=docker-image/${branch}/${component}" >> ${GITHUB_ENV}
5657
for target in $(make echo-all-images); do
5758
case $target in
5859
*$component-amd64*)
@@ -90,7 +91,8 @@ jobs:
9091
run: |
9192
set -x
9293
component=${{ matrix.component }}
93-
echo "CONTEXT=docker-image/v1.17/arm64/${component}" >> ${GITHUB_ENV}
94+
branch=$(make echo-all-images | cut -d '/' -f1)
95+
echo "CONTEXT=docker-image/${branch}/arm64/${component}" >> ${GITHUB_ENV}
9496
for target in $(make echo-all-images); do
9597
case $target in
9698
*$component-arm64*)

.github/workflows/docker-build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ jobs:
6767
run: |
6868
set -x
6969
component=${{ matrix.component }}
70-
echo "CONTEXT=docker-image/v1.17/${component}" >> ${GITHUB_ENV}
70+
branch=$(make echo-all-images | cut -d '/' -f1)
71+
echo "CONTEXT=docker-image/${branch}/${component}" >> ${GITHUB_ENV}
7172
for target in $(make echo-all-images); do
7273
case $target in
7374
*$component-amd64*)
@@ -109,7 +110,8 @@ jobs:
109110
run: |
110111
set -x
111112
component=${{ matrix.component }}
112-
echo "CONTEXT=docker-image/v1.17/arm64/${component}" >> ${GITHUB_ENV}
113+
branch=$(make echo-all-images | cut -d '/' -f1)
114+
echo "CONTEXT=docker-image/${branch}/arm64/${component}" >> ${GITHUB_ENV}
113115
for target in $(make echo-all-images); do
114116
case $target in
115117
*$component-arm64*)

0 commit comments

Comments
 (0)