diff --git a/.github/workflows/fund-sepolia-accounts.yml b/.github/workflows/fund-sepolia-accounts.yml index 806a6c5e237b..a77e296913b0 100644 --- a/.github/workflows/fund-sepolia-accounts.yml +++ b/.github/workflows/fund-sepolia-accounts.yml @@ -100,4 +100,10 @@ jobs: run: | echo "Saving mnemonic to GCP" echo "::add-mask::${{ steps.fund-accounts.outputs.mnemonic }}" - gcloud secrets versions add latest --secret=${{ inputs.sepolia_accounts_mnemonic_secret_name }} --data-file="$MNEMONIC_FILE" + echo "Creating new secret ${{ inputs.sepolia_accounts_mnemonic_secret_name }}" + gcloud secrets create ${{ inputs.sepolia_accounts_mnemonic_secret_name }} + TMP_FILE=$(mktemp) + echo "${{ steps.fund-accounts.outputs.mnemonic }}" > "$TMP_FILE" + gcloud secrets versions add ${{ inputs.sepolia_accounts_mnemonic_secret_name }} --data-file="$TMP_FILE" + rm "$TMP_FILE" + echo "Saved mnemonic to GCP secret ${{ inputs.sepolia_accounts_mnemonic_secret_name }}" diff --git a/.github/workflows/network-deploy.yml b/.github/workflows/network-deploy.yml index fc9be41bc444..cd72b314115b 100644 --- a/.github/workflows/network-deploy.yml +++ b/.github/workflows/network-deploy.yml @@ -91,10 +91,9 @@ on: type: string default: "false" sepolia_accounts_mnemonic_secret_name: - description: The name of the secret which holds the sepolia accounts mnemonic (required for sepolia deployment) + description: The name of the secret which holds the sepolia accounts mnemonic (if not provided, will use '{namespace}-accounts-mnemonic'). required: false type: string - default: sepolia-accounts-mnemonic jobs: fund_sepolia_accounts: @@ -102,7 +101,7 @@ jobs: uses: ./.github/workflows/fund-sepolia-accounts.yml with: values_file: ${{ inputs.values_file }} - sepolia_accounts_mnemonic_secret_name: ${{ inputs.sepolia_accounts_mnemonic_secret_name }} + sepolia_accounts_mnemonic_secret_name: ${{ inputs.sepolia_accounts_mnemonic_secret_name || format('{0}-accounts-mnemonic', inputs.namespace) }} ref: ${{ inputs.ref || github.ref || 'master' }} secrets: GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }} @@ -212,6 +211,11 @@ jobs: continue-on-error: true run: | if ${{ inputs.sepolia_deployment == 'true' }}; then + if [ -z "${{ inputs.sepolia_accounts_mnemonic_secret_name }}" ]; then + SECRET_NAME="${{ env.NAMESPACE }}-accounts-mnemonic" + else + SECRET_NAME="${{ inputs.sepolia_accounts_mnemonic_secret_name }}" + fi L1_DEPLOYMENT_MNEMONIC=$(gcloud secrets versions access latest --secret=${{ inputs.sepolia_accounts_mnemonic_secret_name }}) terraform destroy -auto-approve \ -var="RELEASE_NAME=${{ env.NAMESPACE }}" \ @@ -243,7 +247,12 @@ jobs: working-directory: ./spartan/terraform/deploy-release run: | if ${{ inputs.sepolia_deployment == 'true' }}; then - L1_DEPLOYMENT_MNEMONIC=$(gcloud secrets versions access latest --secret=${{ inputs.sepolia_accounts_mnemonic_secret_name }}) + if [ -z "${{ inputs.sepolia_accounts_mnemonic_secret_name }}" ]; then + SECRET_NAME="${{ env.NAMESPACE }}-accounts-mnemonic" + else + SECRET_NAME="${{ inputs.sepolia_accounts_mnemonic_secret_name }}" + fi + L1_DEPLOYMENT_MNEMONIC=$(gcloud secrets versions access latest --secret=$SECRET_NAME) terraform plan \ -var="RELEASE_NAME=${{ env.NAMESPACE }}" \ -var="VALUES_FILE=${{ env.VALUES_FILE }}" \