From 09992f2a92b5f661c4cf4ce719d9904ca089c6e2 Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Fri, 20 Dec 2024 19:26:06 +0000 Subject: [PATCH 1/4] Fix --- .github/workflows/devnet-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/devnet-deploy.yml b/.github/workflows/devnet-deploy.yml index b1074a4550d..46eb8b99e73 100644 --- a/.github/workflows/devnet-deploy.yml +++ b/.github/workflows/devnet-deploy.yml @@ -26,7 +26,7 @@ on: description: "Whether to deploy on Sepolia network (default: false)" required: false type: boolean - default: false + default: "false" concurrency: group: ${{ github.workflow }}-${{ github.ref }} From ef41bfed7f37f8383e82c5b3261527d48cc795f8 Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Fri, 20 Dec 2024 19:30:27 +0000 Subject: [PATCH 2/4] Another fix --- .github/workflows/devnet-deploy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/devnet-deploy.yml b/.github/workflows/devnet-deploy.yml index 46eb8b99e73..30194932b30 100644 --- a/.github/workflows/devnet-deploy.yml +++ b/.github/workflows/devnet-deploy.yml @@ -25,7 +25,6 @@ on: sepolia_deployment: description: "Whether to deploy on Sepolia network (default: false)" required: false - type: boolean default: "false" concurrency: From f7c02399d14de7a1be9d181ed506dd906d1fa59c Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Fri, 20 Dec 2024 19:33:20 +0000 Subject: [PATCH 3/4] Another fix --- .github/workflows/devnet-deploy.yml | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/.github/workflows/devnet-deploy.yml b/.github/workflows/devnet-deploy.yml index 30194932b30..83496bc3be0 100644 --- a/.github/workflows/devnet-deploy.yml +++ b/.github/workflows/devnet-deploy.yml @@ -22,10 +22,6 @@ on: description: Whether to respect the Terraform lock required: false default: "true" - sepolia_deployment: - description: "Whether to deploy on Sepolia network (default: false)" - required: false - default: "false" concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -50,7 +46,6 @@ jobs: deployment_mnemonic_secret_name: ${{ github.event.inputs.deployment_mnemonic_secret_name }} deployment_salt: ${{ github.event.inputs.deployment_salt }} respect_tf_lock: ${{ github.event.inputs.respect_tf_lock }} - sepolia_deployment: ${{ github.event.inputs.sepolia_deployment }} secrets: GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }} @@ -132,20 +127,11 @@ jobs: # wait for port-forwards to establish sleep 5 - if ${{ inputs.sepolia_deployment }}; then - docker run --rm --network host $AZTEC_DOCKER_IMAGE bootstrap-network \ - --rpc-url http://127.0.0.1:$PXE_PORT \ - --l1-rpc-url ${{ secrets.SEPOLIA_EXTERNAL_HOST }} \ - --l1-chain-id "$L1_CHAIN_ID" \ - --l1-private-key ${{ secrets.SEPOLIA_L1_DEPLOYMENT_PRIVATE_KEY }} \ - --json | tee ./basic_contracts.json - else - docker run --rm --network host $AZTEC_DOCKER_IMAGE bootstrap-network \ - --rpc-url http://127.0.0.1:$PXE_PORT \ - --l1-rpc-url http://127.0.0.1:$ETHEREUM_PORT \ - --l1-chain-id "$L1_CHAIN_ID" \ - --mnemonic "$MNEMONIC" \ - --json | tee ./basic_contracts.json - fi + docker run --rm --network host $AZTEC_DOCKER_IMAGE bootstrap-network \ + --rpc-url http://127.0.0.1:$PXE_PORT \ + --l1-rpc-url http://127.0.0.1:$ETHEREUM_PORT \ + --l1-chain-id "$L1_CHAIN_ID" \ + --mnemonic "$MNEMONIC" \ + --json | tee ./basic_contracts.json aws s3 cp ./basic_contracts.json ${{ env.CONTRACT_S3_BUCKET }}/devnet/basic_contracts.json From a0f9154e593e37c0b77a2c7dbd25baa831e47cfe Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Fri, 20 Dec 2024 19:56:10 +0000 Subject: [PATCH 4/4] Fix --- .github/workflows/devnet-deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/devnet-deploy.yml b/.github/workflows/devnet-deploy.yml index 83496bc3be0..d5e3d7101d5 100644 --- a/.github/workflows/devnet-deploy.yml +++ b/.github/workflows/devnet-deploy.yml @@ -46,6 +46,7 @@ jobs: deployment_mnemonic_secret_name: ${{ github.event.inputs.deployment_mnemonic_secret_name }} deployment_salt: ${{ github.event.inputs.deployment_salt }} respect_tf_lock: ${{ github.event.inputs.respect_tf_lock }} + run_terraform_destroy: "true" secrets: GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}