From a78163a7ee9921a979d30dc208f9b6e95a8f1215 Mon Sep 17 00:00:00 2001 From: spypsy Date: Fri, 1 Dec 2023 12:08:58 +0000 Subject: [PATCH 1/3] don't deploy to npm on master merge --- yarn-project/deploy_npm.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/yarn-project/deploy_npm.sh b/yarn-project/deploy_npm.sh index 20575d12167..e8709ca6fd7 100755 --- a/yarn-project/deploy_npm.sh +++ b/yarn-project/deploy_npm.sh @@ -12,6 +12,12 @@ cp .npmrc ../l1-contracts # This is to be used with the 'canary' tag for testing, and then 'latest' for making it public DIST_TAG=${1:-"latest"} +# Check we're on a release flow. +if [ -z "$COMMIT_TAG" ] && [ ! "$DRY_DEPLOY" -eq 1 ]; then + echo "Not on a release flow, skipping deploy." + exit 0 +fi + function deploy_package() { REPOSITORY=$1 cd $REPOSITORY From f95cfa03cff413ad8984cdc7e8bfa5e1298be13d Mon Sep 17 00:00:00 2001 From: spypsy Date: Fri, 1 Dec 2023 12:10:34 +0000 Subject: [PATCH 2/3] check before extracting repo --- yarn-project/deploy_npm.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yarn-project/deploy_npm.sh b/yarn-project/deploy_npm.sh index e8709ca6fd7..2bd497870f4 100755 --- a/yarn-project/deploy_npm.sh +++ b/yarn-project/deploy_npm.sh @@ -2,6 +2,12 @@ [ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace set -eu +# Check we're on a release flow. +if [ -z "$COMMIT_TAG" ] && [ ! "$DRY_DEPLOY" -eq 1 ]; then + echo "Not on a release flow, skipping deploy." + exit 0 +fi + extract_repo yarn-project /usr/src project cd project/src/yarn-project @@ -12,12 +18,6 @@ cp .npmrc ../l1-contracts # This is to be used with the 'canary' tag for testing, and then 'latest' for making it public DIST_TAG=${1:-"latest"} -# Check we're on a release flow. -if [ -z "$COMMIT_TAG" ] && [ ! "$DRY_DEPLOY" -eq 1 ]; then - echo "Not on a release flow, skipping deploy." - exit 0 -fi - function deploy_package() { REPOSITORY=$1 cd $REPOSITORY From 7f76094ca245655f4c9f5c7d37745a70235dd12e Mon Sep 17 00:00:00 2001 From: spypsy Date: Fri, 1 Dec 2023 12:13:41 +0000 Subject: [PATCH 3/3] fix faucet dockerhub deploy --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 802998ad110..2642e335edd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -991,7 +991,7 @@ jobs: deploy_dockerhub noir x86_64,arm64 deploy_dockerhub aztec-sandbox x86_64,arm64 deploy_dockerhub cli x86_64,arm64 - deploy_dockerhub faucet x86_64,arm64 + deploy_dockerhub aztec-faucet x86_64,arm64 deploy_dockerhub mainnet-fork x86_64,arm64 dpeloy_dockerhub l1-contracts x86_64,arm64