Merge pull request #363 from gradle/cobexer/validate-for-upstream-submission

Validate for upstream submission

Author: cobexer

.editorconfig

@@ -0,0 +1,24 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# Markdown files sometimes need trailing whitespaces.
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2
+
+[*.sh]
+indent_size = 4
+indent_style = tab

.github/workflows/official-images.yml

@@ -0,0 +1,59 @@
+name: Official Images Updates
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - "master"
+      - "8"
+      - "7"
+      - "6"
+  pull_request:
+
+permissions: {}
+
+jobs:
+  library-gradle:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0 # we need all branches so we can read Dockerfiles from them
+      - name: Provision best available generate-stackbrew-library.sh
+        env:
+          EVENT_NAME: ${{ github.event_name }}
+          CURRENT_COMMIT: ${{ github.sha }}
+          BASE_REF: ${{ github.event.pull_request.base.ref }}
+        # if the script was modified in the current PR, use that version; otherwise, use the version from master
+        shell: bash
+        run: |
+          if [ "${EVENT_NAME}" == "pull_request" ] && [ "$(git diff --name-only "origin/$BASE_REF..$CURRENT_COMMIT" -- 'generate-stackbrew-library.sh' | wc -l)" -gt 0 ]; then
+            echo "Using modified generate-stackbrew-library.sh"
+          else
+            echo "Using generate-stackbrew-library.sh from master branch"
+            git checkout origin/master -- generate-stackbrew-library.sh
+          fi
+      - name: Generate library file
+        uses: docker://bash:latest
+        with:
+          # See https://github.com/docker-library/bashbrew?tab=readme-ov-file#installing
+          args: |
+            -c "\
+              apk add --no-cache jq git curl ca-certificates && \
+              git config --global --add safe.directory '*' && \
+              curl -fsSL -o /usr/local/bin/bashbrew https://github.com/docker-library/bashbrew/releases/download/v0.1.13/bashbrew-amd64 && \
+              chmod +x /usr/local/bin/bashbrew && \
+              bashbrew --version && \
+              ./generate-stackbrew-library.sh ${BASE_SHA:+--substitute ${BASE_SHA} ${CURRENT_COMMIT}} > library-gradle \
+              "
+        env:
+          CURRENT_COMMIT: ${{ github.sha }}
+          BASE_SHA: ${{ github.event.pull_request.base.sha }}
+      - name: Archive library file
+        uses: actions/upload-artifact@v4
+        with:
+          name: gradle
+          path: library-gradle

generate-stackbrew-library.sh

@@ -9,6 +9,20 @@ set -o errexit -o nounset -o pipefail
 jq --version > /dev/null
 bashbrew --version > /dev/null
 
+declare -A SUBSTITUTIONS=()
+
+while [[ "$#" -gt 0 ]]; do
+	case $1 in
+		--substitute) SUBSTITUTIONS["$2"]="$3"; shift 2 ; echo "WARNING: using substitution, the result can't be submitted to the official images repository" ;;
+		--help|-h) echo "Usage: ./generate-stackbrew-library.sh [options]
+Options:
+  --substitute <source_sha> <replacement_sha>  Substitute <source_sha> with <replacement_sha> during library generation (can be specified multiple times)
+  --help|-h.                                   Show this help message" >&2; exit 0 ;;
+		*) echo >&2 "error: unknown argument: $1"; exit 1 ;;
+	esac
+	shift
+done
+
 branches=(
 	'master'
 	'8'
@@ -33,6 +47,10 @@ for branch in "${branches[@]}"; do
 	esac
 
 	commit="$(git rev-parse "refs/remotes/$gitRemote/$branch")"
+	if [ -v "SUBSTITUTIONS[$commit]" ]; then
+		commit="${SUBSTITUTIONS[$commit]}"
+		echo "note: substituting commit $commit for branch $branch" >&2
+	fi
 	common="$(
 		cat <<-EOC
 			GitFetch: refs/heads/$branch
@@ -108,6 +126,7 @@ for branch in "${branches[@]}"; do
 
 	firstVersion=
 	for dir in "${directories[@]}"; do
+		echo "branch $branch dir: $dir" >&2
 		# shellcheck disable=SC2001
 		dir="$(echo "$dir" | sed -e 's/[[:space:]]*$//')"
 
@@ -219,6 +238,9 @@ for branch in "${branches[@]}"; do
 				*)
 					lts="${fromTag%%-*}"
 					currentFrom="$(awk <<<"$dockerfile" -F '[=[:space:]]+' 'toupper($1) == "COPY" && $2 == "--from" { print $3; exit }')"
+					if [ -z "$currentFrom" ]; then # if the current LTS is also the latest Java version, there may be no COPY --from
+						currentFrom="$from"
+					fi
 					currentFromTag="${currentFrom##*:}"
 					current="${currentFromTag%%-*}"
 					;;
@@ -251,6 +273,9 @@ for branch in "${branches[@]}"; do
 		if [ "$jdk" = 'jdk-lts-and-current' ] && [ "$variant" != 'graal' ]; then
 			# *technically*, we could re-use "currentFrom" that we scraped above, but there's a lot of conditional logic between here and there so it's safer to just re-scrape it
 			copyFrom="$(awk <<<"$dockerfile" -F '[=[:space:]]+' 'toupper($1) == "COPY" && $2 == "--from" { print $3; exit }')"
+			if [ -z "$copyFrom" ]; then # if the current LTS is also the latest Java version, there may be no COPY --from
+				copyFrom="$from"
+			fi
 			copyFromArches="${archesLookupCache[$copyFrom]:-}"
 			if [ -z "$copyFromArches" ]; then
 				copyFromArches="$(bashbrew cat --format '{{ join ", " .TagEntry.Architectures }}' "https://github.com/docker-library/official-images/raw/HEAD/library/$copyFrom")"