Merge branch 'main' into dependabot/docker/aws-cli/amazonlinux/amazonlinux-2023.8.20250818.0-minimal

Author: thomasleplus

aws-cli/bump-apk-versions.sh

@@ -0,0 +1,38 @@
+#!/bin/sh
+# shellcheck shell=dash
+
+set -euo pipefail
+
+cd "$(\dirname "${0}")"
+
+if [ -f /.dockerenv ]; then
+
+	\apk update
+
+	\apk add perl
+
+	u=$(\apk -u list | \tr '\n' '|')
+
+	\rm -f .bump.csv.bak
+	\sed -e :a -e '/\\$/N; s/\\\n//; ta' Dockerfile | \grep -o -e 'apk[^\&\;]*add[^\&\;]*' | \grep -o -e '[^ ]*=[^ ]*' | while IFS= read -r l; do
+		p="${l%=*}"
+		v1="${l#*=}"
+		v="$(echo "|${u}" | \grep -o -e "\|${p}-[^\|]*upgradable from: ${p}-${v1}" || true)"
+		if [ -z "${v}" ]; then
+			continue
+		fi
+		n=$(($(echo -n "${p}" | wc -c) + 2))
+		v2="$(echo "${v}" | \cut -d ' ' -f 1 | \cut -c ${n}-)"
+		if [ -n "${v2}" ] && [ "${v2}" != "${v1}" ]; then
+			echo "${p} ${v1} -> ${v2}"
+			echo "${p},${v1},${v2},${p}=${v1},${p}=${v2}" >>.bump.csv.bak
+		fi
+	done
+
+else
+
+	\docker run --pull always --rm -t --user root -v "$(pwd):/opt/bump" "leplusorg/${PWD##*/}:main" /opt/bump/"$(\basename "${0}")"
+
+	./create-bump-prs.sh
+
+fi

aws-cli/create-bump-prs.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-
 set -euo pipefail
+IFS=$'\n\t'
 
 cd "$(\dirname "${0}")"
 
@@ -9,18 +9,21 @@ if [ -f .bump.csv.bak ]; then
 		>&2 echo "error: git repo contains uncommitted changes"
 		exit 1
 	fi
+	\git pull
 	csv="$(\cat .bump.csv.bak)"
 	\rm -f .bump.csv.bak
-	while IFS="," read -r p v1 v2 l1 l2; do
+	while IFS=',' read -r p v1 v2 l1 l2; do
 		b="${p}-${v2//[\~\:]/-}"
 		\git switch --create "${b}"
 		\perl -i -p -e "s|\Q${l1}\E|${l2}|g" Dockerfile
 		\git add Dockerfile
 		\git commit -S -m "build(deps): bump ${p} from ${v1} to ${v2}"
-		echo "Please review and push commit in branch \"${b}\". Waiting..."
-		while \git status | \grep -Fq "Your branch is ahead"; do
+		echo -n "Please review and push commit in branch \"${b}\". Waiting..."
+		while [ "$(git rev-list --count --right-only 'origin...HEAD')" -gt 0 ]; do
 			\sleep 1
+			\echo -n .
 		done
+		\echo
 		\gh pr create -f -l build -l dependencies
 		\git checkout -
 	done <<<"${csv}"