Skip to content

Commit

Permalink
Merge branch 'main' into ci/add-rollup-frontend-deployment-workflow-M…
Browse files Browse the repository at this point in the history
…GX-944
  • Loading branch information
tenequm committed May 9, 2024
2 parents 4b6eec5 + abd598d commit d690ba1
Show file tree
Hide file tree
Showing 118 changed files with 73,575 additions and 39,101 deletions.
5 changes: 3 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# SEQUENCER
ROLLUP_SEQUENCER_MANGATA_NODE_URL=ws://node-alice:9944
ROLLUP_SEQUENCER_ETH_CHAIN_URL=ws://anvil:8545
ROLLUP_SEQUENCER_MNEMONIC="//Bob"
ROLLUP_SEQUENCER_MNEMONIC="0x8075991ce870b93a8870eca0c0f91913d12f47948ca0fd25b49c6fa7cdbeee8b"
ROLLUP_SEQUENCER_BLOCK_NUMBER_DELAY=0

# UPDATER
ROLLUP_UPDATER_MANGATA_NODE_URL=ws://node-alice:9944
ROLLUP_UPDATER_ETH_CHAIN_URL=ws://anvil:8545
# one of anvil default accounts private key
ROLLUP_UPDATER_WALLET_PRIVATE_KEY=ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
ROLLUP_UPDATER_FINALIZATION_SOURCE="relay"
# ROLLUP_UPDATER_FINALIZATION_SOURCE="eth"
ROLLUP_UPDATER_FINALIZATION_SOURCE="eth"

# AGGREGATOR
SUBSTRATE_RPC_URL=ws://node-alice:9944
51 changes: 51 additions & 0 deletions .github/workflows/faucet-deploy-app-engine.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Deploy Faucet to App Engine

on:
push:
branches:
- main
paths:
- faucet-web-app/**

permissions:
contents: read
id-token: write
deployments: write

env:
CI: false

jobs:
build-and-deploy:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Setup Node.js and yarn
uses: actions/setup-node@v4
with:
node-version: "18"

- name: Install dependencies
working-directory: faucet-web-app
run: npm install

- name: Build React app
working-directory: faucet-web-app
run: npm run build

- name: Google auth
uses: 'google-github-actions/auth@v2'
with:
workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }}

- name: Upload folder
uses: 'google-github-actions/upload-cloud-storage@v2'
with:
path: 'faucet-web-app/build'
destination: 'holesky-faucet.gasp.xyz'
parent: false
process_gcloudignore: false
16 changes: 15 additions & 1 deletion .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ jobs:
steps:
- name: Set global version
id: set_vars
run: echo "GLOBAL_VERSION=${{ github.sha }}" >> $GITHUB_OUTPUT
run: |
echo "GLOBAL_VERSION=${{ github.sha }}" >> $GITHUB_OUTPUT
echo "IMAGE TAG=${{ github.sha }}" >> $GITHUB_STEP_SUMMARY
build-and-test:
needs: [init]
Expand All @@ -43,6 +45,18 @@ jobs:
with:
env: fungible
version: ${{ needs.init.outputs.GLOBAL_VERSION }}

run-e2e-test:
name: Run e2e tests
needs: [init, build-and-test]
uses: ./.github/workflows/reusable-e2e-tests.yml
secrets: inherit
permissions:
contents: read
actions: read
checks: write
with:
globalVersion: ${{ needs.init.outputs.GLOBAL_VERSION }}

clean-up-fungible:
name: Delete fungible environment
Expand Down
110 changes: 0 additions & 110 deletions .github/workflows/reusable-avs-tests.yml

This file was deleted.

6 changes: 5 additions & 1 deletion .github/workflows/reusable-build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ jobs:
echo '```json' >> $GITHUB_STEP_SUMMARY
echo "$(cat contracts/script/output/31337/avs_deployment_output.json)" >> $GITHUB_STEP_SUMMARY
echo '```' >> $GITHUB_STEP_SUMMARY
# Save the state to the Github Step summary
echo '```json' >> $GITHUB_STEP_SUMMARY
echo "$(cat rolldown-contract/out/addresses.json)" >> $GITHUB_STEP_SUMMARY
echo '```' >> $GITHUB_STEP_SUMMARY
- run: |
docker login -u ${{ secrets.ORG_DOCKERHUB_USERNAME }} -p ${{ secrets.ORG_DOCKERHUB_TOKEN }}
Expand Down
Loading

0 comments on commit d690ba1

Please sign in to comment.