Skip to content

Commit

Permalink
Merge branch 'main' into feat/taikoon-alt-networks
Browse files Browse the repository at this point in the history
  • Loading branch information
bearni95 committed May 14, 2024
2 parents 36cc13d + e965597 commit 11545f7
Show file tree
Hide file tree
Showing 224 changed files with 8,163 additions and 1,367 deletions.
4 changes: 2 additions & 2 deletions .github/actions/install-pnpm-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ runs:
node-version: 20

- name: Install pnpm
uses: pnpm/action-setup@v3
uses: pnpm/action-setup@v4
id: pnpm-install
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down
File renamed without changes.
17 changes: 10 additions & 7 deletions .github/workflows/bridge-ui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,25 @@ name: Bridge UI CI/CD
on:
push:
branches-ignore:
- main
- release-please-*
paths:
- "packages/bridge-ui/**"
tags:
- "bridge-ui-v*"
pull_request:
paths:
- "packages/bridge-ui/**"

jobs:
build-and-test:
uses: ./.github/workflows/bridge-ui-ci.yml
uses: ./.github/workflows/bridge-ui--ci.yml

# Deployment name follow the pattern: deploy_<appname(bridge-ui)>_<network(devnet|hekla|mainnet)>_<environment(preview|production)>
deploy_bridge-ui_hekla_preview:
if: ${{ github.ref_name != 'main' }}
if: ${{ github.ref_type != 'tag' }}
needs: build-and-test
uses: ./.github/workflows/vercel-deploy.yml
uses: ./.github/workflows/repo--vercel-deploy.yml
with:
environment: "preview"
flags: ""
Expand All @@ -28,9 +31,9 @@ jobs:
vercel_token: ${{ secrets.VERCEL_TOKEN }}

deploy_bridge-ui_devnet_preview:
if: ${{ github.ref_name != 'main' }}
if: ${{ github.ref_type != 'tag' }}
needs: build-and-test
uses: ./.github/workflows/vercel-deploy.yml
uses: ./.github/workflows/repo--vercel-deploy.yml
with:
environment: "preview"
flags: ""
Expand All @@ -40,9 +43,9 @@ jobs:
vercel_token: ${{ secrets.VERCEL_TOKEN }}

deploy_bridge-ui_hekla_production:
if: ${{ github.ref_name == 'main' && contains(github.ref, 'refs/tags/bridge-ui-') }}
if: ${{ startsWith(github.ref, 'refs/tags/bridge-ui-v') }}
needs: build-and-test
uses: ./.github/workflows/vercel-deploy.yml
uses: ./.github/workflows/repo--vercel-deploy.yml
with:
environment: "production"
flags: "--prod"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
name: Blobstorage Preview
name: Docs Site Preview

env:
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID_BLOBSTORAGE }}
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID_DOCS_SITE }}

on:
push:
branches-ignore:
- main
- release-please-*
paths:
- "packages/blobstorage/**"
- "packages/docs-site/**"

jobs:
deploy-bolbstorage-preview:
deploy-docs-site-preview:
runs-on: [taiko-runner]
steps:
- name: Checkout repository
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
name: Blobstorage Production
name: Docs Site Production

env:
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID_BLOBSTORAGE }}
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID_DOCS_SITE }}

on:
push:
tags:
- "blobstorage-*"
- "docs-site-*"

jobs:
deploy-blobstorage-production:
deploy-docs-site-production:
runs-on: [taiko-runner]
steps:
- name: Checkout repository
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/eventindexer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ on:
pull_request:
paths:
- "packages/eventindexer/**"
- "go.mod"
- "go.sum"

jobs:
lint-eventindexer:
name: lint
name: lint-eventindexer
runs-on: [taiko-runner]
steps:
- uses: actions/setup-go@v5
Expand All @@ -30,7 +32,7 @@ jobs:

test-eventindexer:
runs-on: [taiko-runner]
needs: lint
needs: lint-eventindexer
steps:
- name: Cancel Previous Runs
uses: styfle/[email protected]
Expand All @@ -54,7 +56,7 @@ jobs:

push-eventindexer-docker-image:
# only push docker image on PR merge to main
if: ${{ github.event }} == 'push'
if: ${{ github.event == 'push' && github.ref == 'refs/heads/main' }}
name: Build and push docker image
runs-on: [taiko-runner]

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@ jobs:
- name: Install pnpm dependencies
uses: ./.github/actions/install-pnpm-dependencies

- name: Copy .env.example to .env
working-directory: ./packages/guardian-prover-health-check-ui
run: cp .env.example .env

- name: Export config to .env
working-directory: ./packages/guardian-prover-health-check-ui
run: pnpm export:config

- name: Build
env:
SKIP_ENV_VALIDATION: "true"
Expand All @@ -38,9 +30,3 @@ jobs:
- name: Linting
working-directory: ./packages/guardian-prover-health-check-ui
run: pnpm lint

- name: Unit tests
env:
SKIP_ENV_VALIDATION: "true"
working-directory: ./packages/guardian-prover-health-check-ui
run: pnpm test:unit
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ on:

jobs:
build-and-test:
uses: ./.github/workflows/guardians-ui-ci.yml
uses: ./.github/workflows/guardian-prover-health-check-ui--ci.yml

# Deployment name follow the pattern: deploy_<appname(guardian-prover-health-check-ui)>_<network(devnet|hekla|mainnet)>_<environment(preview|production)>
deploy_guardians-ui_hekla_preview:
if: ${{ github.ref_name != 'main' }}
needs: build-and-test
uses: ./.github/workflows/vercel-deploy.yml
uses: ./.github/workflows/repo--vercel-deploy.yml
with:
environment: "preview"
flags: ""
Expand All @@ -30,7 +30,7 @@ jobs:
deploy_guardians-ui_devnet_preview:
if: ${{ github.ref_name != 'main' }}
needs: build-and-test
uses: ./.github/workflows/vercel-deploy.yml
uses: ./.github/workflows/repo--vercel-deploy.yml
with:
environment: "preview"
flags: ""
Expand All @@ -42,7 +42,7 @@ jobs:
deploy_guardians-ui_hekla_production:
if: ${{ github.ref_name == 'main' && contains(github.ref, 'refs/tags/guardians-ui-') }}
needs: build-and-test
uses: ./.github/workflows/vercel-deploy.yml
uses: ./.github/workflows/repo--vercel-deploy.yml
with:
environment: "production"
flags: "--prod"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ on:
pull_request:
paths:
- "packages/guardian-prover-health-check/**"
- "go.mod"
- "go.sum"

jobs:
lint:
name: lint
lint-guardian-prover-health-check:
name: lint-guardian-prover-health-check
runs-on: [taiko-runner]
steps:
- uses: actions/setup-go@v5
Expand All @@ -28,9 +30,9 @@ jobs:
working-directory: ./packages/guardian-prover-health-check
args: --config=.golangci.yml --timeout=4m

test:
test-guardian-prover-health-check:
runs-on: [taiko-runner]
needs: lint
needs: lint-guardian-prover-health-check
steps:
- name: Cancel Previous Runs
uses: styfle/[email protected]
Expand All @@ -52,9 +54,9 @@ jobs:
files: ./packages/guardian-prover-health-check/coverage.txt
flags: guardian-prover-health-check

push-docker-image:
push-guardian-prover-health-check-docker-image:
# only push docker image on PR merge to main
if: ${{ github.event }} == 'push'
if: ${{ github.event == 'push' && github.ref == 'refs/heads/main' }}
name: Build and push docker image
runs-on: [taiko-runner]

Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/relayer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ on:
pull_request:
paths:
- "packages/relayer/**"
- "go.mod"
- "go.sum"

jobs:
lint-relayer:
name: lint
name: lint-relayer
runs-on: [taiko-runner]
steps:
- uses: actions/setup-go@v5
Expand All @@ -30,7 +32,7 @@ jobs:

test-relayer:
runs-on: [taiko-runner]
needs: lint
needs: lint-relayer
steps:
- name: Cancel Previous Runs
uses: styfle/[email protected]
Expand All @@ -54,7 +56,7 @@ jobs:

push-relayer-docker-image:
# only push docker image on PR merge to main
if: ${{ github.event }} == 'push'
if: ${{ github.event == 'push' && github.ref == 'refs/heads/main' }}
name: Build and push docker image
runs-on: [taiko-runner]

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
main
deps
deps-dev
docs-site
blobstorage
branding
bridge-ui
Expand Down
File renamed without changes.
13 changes: 9 additions & 4 deletions .github/workflows/supplementary-contracts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,15 @@ jobs:
- name: Install pnpm dependencies
uses: ./.github/actions/install-pnpm-dependencies

- name: Check formatting
working-directory: ./packages/supplementary-contracts
run: forge fmt --check

- name: Unit Tests
working-directory: ./packages/supplementary-contracts
run: pnpm clean && pnpm test

- name: Format solidity && update contract layout table
working-directory: ./packages/supplementary-contracts
run: pnpm layout && forge fmt

- name: Commit contract layout table
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: "forge fmt & update contract layout table"
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
pull_request:
paths:
- "packages/taiko-client/**"
- "go.mod"
- "go.sum"

jobs:
lint:
Expand Down
65 changes: 0 additions & 65 deletions .github/workflows/taiko-client-swagger.yml

This file was deleted.

Loading

0 comments on commit 11545f7

Please sign in to comment.