From 46ce681a5561de0417f44809ec629494b115788f Mon Sep 17 00:00:00 2001 From: Steve Worley Date: Tue, 31 Aug 2021 14:59:06 +1000 Subject: [PATCH 1/3] Update scaffold tooling version. --- composer.json | 2 +- govcms-ci.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 2f0ce18..acf1880 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "minimum-stability": "alpha", "require": { - "govcms/scaffold-tooling": "~2", + "govcms/scaffold-tooling": "~3", "symfony/yaml": "~5", "symfony/console": "~5" }, diff --git a/govcms-ci.Dockerfile b/govcms-ci.Dockerfile index dccb783..b6494cc 100644 --- a/govcms-ci.Dockerfile +++ b/govcms-ci.Dockerfile @@ -27,7 +27,7 @@ RUN curl -L -o "/tmp/shellcheck-v0.7.1.tar.xz" "https://github.com/koalaman/shel && chmod +x /usr/bin/shellcheck # Install BATS. -RUN apk add --no-cache bats=1.3.0-r0 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main +RUN apk add --no-cache bats=1.3.0-r0 --repository=http://dl-cdn.alpinelinux.org/alpine/v3.14/main # Required for docker-compose to find zlib. ENV LD_LIBRARY_PATH=/lib:/usr/lib From 7ab42f7ef6b77fe14eb187df1220e71c524025ed Mon Sep 17 00:00:00 2001 From: Steve Worley Date: Thu, 16 Sep 2021 09:20:19 +1000 Subject: [PATCH 2/3] Update prepare script for edge builds. --- scripts/prepare | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/prepare b/scripts/prepare index 00e5e81..8546b92 100755 --- a/scripts/prepare +++ b/scripts/prepare @@ -5,6 +5,6 @@ echo "[---] CI_REGISTRY: ${CI_REGISTRY}" if [ "$CI_COMMIT_BRANCH" != "master" ]; then # Pin to the develop branch for scaffold-tooling. - sed -i.bak -E "s#(\"govcms\/scaffold-tooling\":[[:space:]]*\").+(\")#\1dev-develop\2#g" composer.json + sed -i.bak -E "s#(\"govcms\/scaffold-tooling\":[[:space:]]*\").+(\")#\1dev-9x-develop\2#g" composer.json echo "[---] Updated to govcms/scaffold-tooling:dev-develop" fi From a42977ad77f8f08f87d9b36575104002849cbab7 Mon Sep 17 00:00:00 2001 From: Steve Worley Date: Thu, 16 Sep 2021 09:22:21 +1000 Subject: [PATCH 3/3] Update prepare --- scripts/prepare | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/prepare b/scripts/prepare index 8546b92..73ccba3 100755 --- a/scripts/prepare +++ b/scripts/prepare @@ -5,6 +5,6 @@ echo "[---] CI_REGISTRY: ${CI_REGISTRY}" if [ "$CI_COMMIT_BRANCH" != "master" ]; then # Pin to the develop branch for scaffold-tooling. - sed -i.bak -E "s#(\"govcms\/scaffold-tooling\":[[:space:]]*\").+(\")#\1dev-9x-develop\2#g" composer.json + sed -i.bak -E "s#(\"govcms\/scaffold-tooling\":[[:space:]]*\").+(\")#\1dev-9.x-develop\2#g" composer.json echo "[---] Updated to govcms/scaffold-tooling:dev-develop" fi