Skip to content
This repository has been archived by the owner on Sep 1, 2022. It is now read-only.

Commit

Permalink
Merge pull request #20 from govCMS/feature/scaffold-tooling-update
Browse files Browse the repository at this point in the history
Update scaffold tooling version.
  • Loading branch information
steveworley authored Sep 15, 2021
2 parents dc8c29b + a42977a commit 0612656
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"minimum-stability": "alpha",
"require": {
"govcms/scaffold-tooling": "~2",
"govcms/scaffold-tooling": "~3",
"symfony/yaml": "~5",
"symfony/console": "~5"
},
Expand Down
2 changes: 1 addition & 1 deletion govcms-ci.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/prepare
Original file line number Diff line number Diff line change
Expand Up @@ -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-9.x-develop\2#g" composer.json
echo "[---] Updated to govcms/scaffold-tooling:dev-develop"
fi

0 comments on commit 0612656

Please sign in to comment.