Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .github/actions/setup-k8s-terraform/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,17 @@ runs:
ref: ${{ inputs.ref }}

- name: Authenticate to Google Cloud
if: ${{ inputs.cluster != 'kind' }}
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f
with:
credentials_json: ${{ inputs.gcp_sa_key }}

- name: Set up Cloud SDK
if: ${{ inputs.cluster != 'kind' }}
uses: google-github-actions/setup-gcloud@6189d56e4096ee891640bb02ac264be376592d6a

- name: Install GKE Auth Plugin
if: ${{ inputs.cluster != 'kind' }}
shell: bash
run: |
gcloud components install gke-gcloud-auth-plugin --quiet
Expand Down
3 changes: 2 additions & 1 deletion .github/local_workflow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,12 @@ fi
shift
args=("$@")

# Only needed when running against GKE
SA_KEY_JSON=$(cat "$GOOGLE_APPLICATION_CREDENTIALS")

mkdir -p $REPO_ROOT/.github/.act-tool-cache

act workflow_dispatch -j $workflow_name \
act -j $workflow_name \
--env RUNNER_TOOL_CACHE=/work/toolcache \
-s GITHUB_TOKEN="$(gh auth token)" \
-s GCP_SA_KEY="$SA_KEY_JSON" \
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/ci3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ jobs:
# (github.event.pull_request.head.repo.fork resolves to nil if not a pull request)
if: github.event.pull_request.head.repo.fork != true && github.event.pull_request.draft == false
environment: ${{ startsWith(github.ref, 'refs/tags/v') && 'master' || '' }}
env:
GOOGLE_APPLICATION_CREDENTIALS: /tmp/gcp-key.json
steps:
#############
# Prepare Env
Expand Down Expand Up @@ -89,12 +91,9 @@ jobs:
chmod 600 ~/.ssh/build_instance_key
sudo apt install -y --no-install-recommends redis-tools parallel

- name: Prepare GCP key
env:
GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
- name: Write GCP key into credentials file
run: |
echo "$GCP_SA_KEY" | base64 -w 0 > gcp_sa_key.b64
echo "GCP_SA_KEY_B64=$(cat gcp_sa_key.b64)" >> $GITHUB_ENV
echo "${{ secrets.GCP_SA_KEY }}" > ${{ env.GOOGLE_APPLICATION_CREDENTIALS }}

- name: Get Tree Hash
run: echo "TREE_HASH=$(git rev-parse HEAD^{tree})" >> $GITHUB_ENV
Expand Down Expand Up @@ -122,7 +121,7 @@ jobs:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
# Nightly test env vars.
GCP_SA_KEY_B64: ${{ env.GCP_SA_KEY_B64 }}
GOOGLE_APPLICATION_CREDENTIALS: ${{ env.GOOGLE_APPLICATION_CREDENTIALS }}
EXTERNAL_ETHEREUM_HOSTS: "https://json-rpc.${{ secrets.GCP_SEPOLIA_URL }}?key=${{ secrets.GCP_SEPOLIA_API_KEY }},${{ secrets.INFURA_SEPOLIA_URL }}"
EXTERNAL_ETHEREUM_CONSENSUS_HOST: "https://beacon.${{ secrets.GCP_SEPOLIA_URL }}"
EXTERNAL_ETHEREUM_CONSENSUS_HOST_API_KEY: ${{ secrets.GCP_SEPOLIA_API_KEY }}
Expand Down
277 changes: 0 additions & 277 deletions .github/workflows/deploy-aztec-infra.yml

This file was deleted.

Loading
Loading