File tree 1 file changed +5
-0
lines changed
.github/workflows/scripts
1 file changed +5
-0
lines changed Original file line number Diff line number Diff line change @@ -70,7 +70,9 @@ for BRANCH in "$@"; do
70
70
cd " $MAINTENANCE_WORKSPACE /$BRANCH "
71
71
72
72
# 2. Now let's apply the patches (we have them checked out in $GITHUB_WORKSPACE, not necessarily in this local checkout)
73
+ echo " Checking for patches..."
73
74
if [[ -d ${GITHUB_WORKSPACE} /modules/container-base/src/backports/$BRANCH ]]; then
75
+ echo " Applying patches now."
74
76
find " ${GITHUB_WORKSPACE} /modules/container-base/src/backports/$BRANCH " -type f -name ' *.patch' -print0 | xargs -0 -n1 patch -p1 -s -i
75
77
fi
76
78
@@ -82,16 +84,19 @@ for BRANCH in "$@"; do
82
84
else
83
85
BASE_IMAGE_REF=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image -Dbase.image.tag.suffix=" " -q -DforceStdout )
84
86
fi
87
+ echo " Determined BASE_IMAGE_REF=$BASE_IMAGE_REF from Maven"
85
88
86
89
# 4. Check for Temurin image updates
87
90
JAVA_IMAGE_REF=$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=java.image -q -DforceStdout )
91
+ echo " Determined JAVA_IMAGE_REF=$JAVA_IMAGE_REF from Maven"
88
92
NEWER_JAVA_IMAGE=0
89
93
if check_newer_parent " $JAVA_IMAGE_REF " " $BASE_IMAGE_REF " ; then
90
94
NEWER_JAVA_IMAGE=1
91
95
fi
92
96
93
97
# 5. Check for package updates in base image
94
98
PKGS=" $( grep " ARG PKGS" modules/container-base/src/main/docker/Dockerfile | cut -f2 -d= | tr -d ' "' ) "
99
+ echo " Determined installed packages=\" $PKGS \" from Maven"
95
100
NEWER_PKGS=0
96
101
# Don't bother with package checks if the java image is newer already
97
102
if ! (( NEWER_JAVA_IMAGE )) ; then
You can’t perform that action at this time.
0 commit comments