diff --git a/yarn-project/canary/Dockerfile b/yarn-project/canary/Dockerfile index 3411ed2ca0a..d24db9ae861 100644 --- a/yarn-project/canary/Dockerfile +++ b/yarn-project/canary/Dockerfile @@ -1,9 +1,9 @@ -FROM 278380418400.dkr.ecr.us-east-2.amazonaws.com/yarn-project-base AS builder +FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder RUN apk update && apk add --no-cache udev ttf-freefont chromium curl jq bash ENV CHROME_BIN="/usr/bin/chromium-browser" PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true" -ARG COMMIT_TAG="0.7.5" +ARG COMMIT_TAG="." COPY . . diff --git a/yarn-project/end-to-end/scripts/setup_canary.sh b/yarn-project/end-to-end/scripts/setup_canary.sh index 2f519f6405f..6d6806fed08 100755 --- a/yarn-project/end-to-end/scripts/setup_canary.sh +++ b/yarn-project/end-to-end/scripts/setup_canary.sh @@ -7,7 +7,7 @@ TARGET_PKGS_FILE=$2 # Check if file exists and read it into an array if [ -f "$TARGET_PKGS_FILE" ]; then mapfile -t TARGET_PKGS < <(cat "$TARGET_PKGS_FILE") - echo "Loaded array:" + echo "Loaded package array:" for i in "${TARGET_PKGS[@]}"; do echo "$i" done @@ -20,7 +20,16 @@ if [ -z "$COMMIT_TAG" ]; then exit 0 fi +set +e # Temporarily disable exit on error VERSION=$(npx semver $COMMIT_TAG) +RESULT=$? # Capture the exit status of the last command +set -e # Re-enable exit on error + +if [ $RESULT -ne 0 ]; then + echo "Error when running 'npx semver' with commit tag: $COMMIT_TAG" + exit 1 +fi + if [ -z "$VERSION" ]; then echo "$COMMIT_TAG is not a semantic version." exit 1