Skip to content

fix: build script exiting on failed grep #2384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PhilWindle merged 2 commits into from
Sep 19, 2023
Merged

fix: build script exiting on failed grep #2384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
428a665
fix: typo in build script
spypsy Sep 18, 2023
c273706
Don't exit build on failed grep
spypsy Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions build-system/scripts/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,10 @@ if [[ $FORCE_BUILD == 'false' ]] && check_rebuild cache-"$CONTENT_HASH" $REPOSIT
exit 0
fi

echo "Initializing submodules..."
init_submodules $REPOSITORY

echo "Checking for terraform..."
# Validate any terraform if it exists.
if [ -d $ROOT_PATH/$PROJECT_DIR/terraform ]; then
ensure_terraform
Expand All @@ -102,7 +104,7 @@ if [ -d $ROOT_PATH/$PROJECT_DIR/terraform ]; then
fi

# Pull latest parents that are not ours. We also do not want to pull images suffixed by _, this is how we scope intermediate build images.
PARENTS=$(cat $DOCKERFILE | sed -n -e 's/^FROM \([^[:space:]]\+\).*/\1/p' | sed '/_$/d' | grep -v $ECR_DEPLOY_URL | sort | uniq)
PARENTS=$(cat $DOCKERFILE | sed -n -e 's/^FROM \([^[:space:]]\+\).*/\1/p' | sed '/_$/d' | { grep -v $ECR_DEPLOY_URL || true; } | sort | uniq)
for PARENT in $PARENTS; do
[ "$PARENT" == "scratch" ] && continue
fetch_image $PARENT
Expand All @@ -127,7 +129,8 @@ for PARENT in $PARENTS; do
retry docker tag $PARENT_IMAGE_URI $TAG
done

COMMIT_TAG_VERSION=$(extract_tag_version $REPOSITORY false)
echo "Extracting commit tag version..."
COMMIT_TAG_VERSION=$(extract_tag_version $REPOSITORY "false")

# Pull, build and push each named stage to cache.
STAGE_CACHE_FROM=""
Expand Down
4 changes: 4 additions & 0 deletions yarn-project/canary/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ WORKDIR /usr/src/yarn-project/canary
RUN ./scripts/update_packages.sh $COMMIT_TAG
RUN yarn && yarn build

FROM node:18-alpine
COPY --from=builder /usr/src/ /usr/src/
WORKDIR /usr/src/yarn-project/canary

# Copy web artifacts for browser test
RUN cp ./node_modules/@aztec/aztec.js/dest/main.js src/web/
RUN cp ./node_modules/@aztec/circuits.js/resources/aztec3-circuits.wasm src/web/
Expand Down