From b12cade3fbe21c676752616766e41698a58f3d5f Mon Sep 17 00:00:00 2001 From: Tom French <15848336+TomAFrench@users.noreply.github.com> Date: Tue, 19 Nov 2024 19:33:54 +0000 Subject: [PATCH 1/6] fix: fix npm publishing --- .github/workflows/publish-aztec-packages.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/publish-aztec-packages.yml b/.github/workflows/publish-aztec-packages.yml index 1206673b3af..84eab4beaaa 100644 --- a/.github/workflows/publish-aztec-packages.yml +++ b/.github/workflows/publish-aztec-packages.yml @@ -275,42 +275,45 @@ jobs: with: concurrency_key: publish-npm dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}" - - name: Publish yarn-project NPM packages + + - name: Publish bb.js NPM package run: | DEPLOY_TAG=${{ env.DEPLOY_TAG }} VERSION=${DEPLOY_TAG#aztec-packages-v} earthly-ci \ --no-output \ --secret NPM_TOKEN=${{ env.NPM_TOKEN }} \ - ./yarn-project+publish-npm \ + ./barretenberg/ts+publish-npm \ --DIST_TAG=latest \ --VERSION=$VERSION \ --DRY_RUN=${{ (github.event.inputs.publish == 'false') && '1' || '0' }} - - - name: Publish l1-contracts NPM package + + - name: Publish yarn-project NPM packages run: | DEPLOY_TAG=${{ env.DEPLOY_TAG }} - VERSION=${DEPLOY_TAG#aztec-packages-v + VERSION=${DEPLOY_TAG#aztec-packages-v} earthly-ci \ --no-output \ --secret NPM_TOKEN=${{ env.NPM_TOKEN }} \ - ./l1-contracts+publish-npm \ + ./yarn-project+publish-npm \ --DIST_TAG=latest \ --VERSION=$VERSION \ --DRY_RUN=${{ (github.event.inputs.publish == 'false') && '1' || '0' }} - - name: Publish bb.js NPM package + - name: Publish l1-contracts NPM package run: | DEPLOY_TAG=${{ env.DEPLOY_TAG }} VERSION=${DEPLOY_TAG#aztec-packages-v} earthly-ci \ --no-output \ --secret NPM_TOKEN=${{ env.NPM_TOKEN }} \ - ./barretenberg/ts+publish-npm \ + ./l1-contracts+publish-npm \ --DIST_TAG=latest \ --VERSION=$VERSION \ --DRY_RUN=${{ (github.event.inputs.publish == 'false') && '1' || '0' }} + + publish-aztec-up: needs: [configure, publish-manifests] runs-on: ubuntu-latest From ce6c8e7a119cd1c07384127fb2de3e4d10c3c590 Mon Sep 17 00:00:00 2001 From: Tom French <15848336+TomAFrench@users.noreply.github.com> Date: Tue, 19 Nov 2024 19:36:23 +0000 Subject: [PATCH 2/6] Apply suggestions from code review --- .github/workflows/publish-aztec-packages.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/publish-aztec-packages.yml b/.github/workflows/publish-aztec-packages.yml index 84eab4beaaa..74fcf4c8f5e 100644 --- a/.github/workflows/publish-aztec-packages.yml +++ b/.github/workflows/publish-aztec-packages.yml @@ -287,7 +287,6 @@ jobs: --DIST_TAG=latest \ --VERSION=$VERSION \ --DRY_RUN=${{ (github.event.inputs.publish == 'false') && '1' || '0' }} - - name: Publish yarn-project NPM packages run: | DEPLOY_TAG=${{ env.DEPLOY_TAG }} @@ -312,8 +311,6 @@ jobs: --VERSION=$VERSION \ --DRY_RUN=${{ (github.event.inputs.publish == 'false') && '1' || '0' }} - - publish-aztec-up: needs: [configure, publish-manifests] runs-on: ubuntu-latest From b8608580416eefa933ddfe316a78d9b1e50a240a Mon Sep 17 00:00:00 2001 From: Tom French <15848336+TomAFrench@users.noreply.github.com> Date: Tue, 19 Nov 2024 19:36:44 +0000 Subject: [PATCH 3/6] Update .github/workflows/publish-aztec-packages.yml --- .github/workflows/publish-aztec-packages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish-aztec-packages.yml b/.github/workflows/publish-aztec-packages.yml index 74fcf4c8f5e..385644756e9 100644 --- a/.github/workflows/publish-aztec-packages.yml +++ b/.github/workflows/publish-aztec-packages.yml @@ -287,6 +287,7 @@ jobs: --DIST_TAG=latest \ --VERSION=$VERSION \ --DRY_RUN=${{ (github.event.inputs.publish == 'false') && '1' || '0' }} + - name: Publish yarn-project NPM packages run: | DEPLOY_TAG=${{ env.DEPLOY_TAG }} From dbbf1f6eda6acbdfc9dda37b6ca5e436a1d45196 Mon Sep 17 00:00:00 2001 From: Tom French <15848336+TomAFrench@users.noreply.github.com> Date: Tue, 19 Nov 2024 19:37:03 +0000 Subject: [PATCH 4/6] Update .github/workflows/publish-aztec-packages.yml --- .github/workflows/publish-aztec-packages.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/publish-aztec-packages.yml b/.github/workflows/publish-aztec-packages.yml index 385644756e9..74fcf4c8f5e 100644 --- a/.github/workflows/publish-aztec-packages.yml +++ b/.github/workflows/publish-aztec-packages.yml @@ -287,7 +287,6 @@ jobs: --DIST_TAG=latest \ --VERSION=$VERSION \ --DRY_RUN=${{ (github.event.inputs.publish == 'false') && '1' || '0' }} - - name: Publish yarn-project NPM packages run: | DEPLOY_TAG=${{ env.DEPLOY_TAG }} From 1eada4a3adc6aa68b7a1557a6f73068a67d3924d Mon Sep 17 00:00:00 2001 From: Tom French <15848336+TomAFrench@users.noreply.github.com> Date: Tue, 19 Nov 2024 19:37:23 +0000 Subject: [PATCH 5/6] Update .github/workflows/publish-aztec-packages.yml --- .github/workflows/publish-aztec-packages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish-aztec-packages.yml b/.github/workflows/publish-aztec-packages.yml index 74fcf4c8f5e..4e73421d1e4 100644 --- a/.github/workflows/publish-aztec-packages.yml +++ b/.github/workflows/publish-aztec-packages.yml @@ -288,6 +288,7 @@ jobs: --VERSION=$VERSION \ --DRY_RUN=${{ (github.event.inputs.publish == 'false') && '1' || '0' }} - name: Publish yarn-project NPM packages + run: | DEPLOY_TAG=${{ env.DEPLOY_TAG }} VERSION=${DEPLOY_TAG#aztec-packages-v} From 885b18e3d3abb99956d57be13646ccbc4cc172ef Mon Sep 17 00:00:00 2001 From: Tom French <15848336+TomAFrench@users.noreply.github.com> Date: Tue, 19 Nov 2024 19:37:54 +0000 Subject: [PATCH 6/6] Update .github/workflows/publish-aztec-packages.yml --- .github/workflows/publish-aztec-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-aztec-packages.yml b/.github/workflows/publish-aztec-packages.yml index 4e73421d1e4..b6a74a2f854 100644 --- a/.github/workflows/publish-aztec-packages.yml +++ b/.github/workflows/publish-aztec-packages.yml @@ -287,8 +287,8 @@ jobs: --DIST_TAG=latest \ --VERSION=$VERSION \ --DRY_RUN=${{ (github.event.inputs.publish == 'false') && '1' || '0' }} - - name: Publish yarn-project NPM packages + - name: Publish yarn-project NPM packages run: | DEPLOY_TAG=${{ env.DEPLOY_TAG }} VERSION=${DEPLOY_TAG#aztec-packages-v}