Skip to content

Commit 0deced6

Browse files
authored
Merge pull request #572 from WASdev/main
GitHub Action release updates automation fixes (needed in vNext)
2 parents c054f00 + a31c798 commit 0deced6

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

.github/workflows/update_files_for_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818
type: string
1919
BUILD_LABEL:
2020
description: 'Enter build label of release driver'
21-
default: 'replace_with_gm_driver_label'
21+
default: '{replace_with_gm_driver_label}'
2222
required: false
2323
type: string
2424

create-new-release.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ for file in $(find ./ga/latest ./ga/$NEW_VERSION -name Dockerfile.*); do
3636
sed -i'.bak' -e "s/ARG LIBERTY_BUILD_LABEL=.*/ARG LIBERTY_BUILD_LABEL=$BUILD_LABEL/g" $file;
3737

3838
# Do these substitutions only in $NEW_VERSION, not latest.
39-
if [[ "$file" == "./ga/$NEW_VERSION/"* ]];
39+
# And skip the oidcProvider files.
40+
if [[ "$file" == "./ga/$NEW_VERSION/"* && "$file" != "./ga/$NEW_VERSION/oidcProvider"* ]];
4041
then
4142
sed -i'.bak' -e "s/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:kernel/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:$NEW_VERSION-kernel/g" $file;
4243
sed -i'.bak' -e "s/FROM websphere-liberty:kernel/FROM websphere-liberty:$NEW_VERSION-kernel/g" $file;

0 commit comments

Comments
 (0)