Skip to content

Commit

Permalink
Merge branch 'main' into guardian-no-contest
Browse files Browse the repository at this point in the history
  • Loading branch information
davidtaikocha authored May 14, 2024
2 parents 887a516 + f937525 commit db56fb3
Show file tree
Hide file tree
Showing 92 changed files with 5,725 additions and 292 deletions.
21 changes: 12 additions & 9 deletions .github/workflows/bridge-ui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ 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/**"
Expand All @@ -16,36 +19,36 @@ jobs:

# 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
with:
environment: 'preview'
flags: ''
environment: "preview"
flags: ""
secrets:
vercel_project_id: ${{ secrets.VERCEL_PROJECT_ID_BRIDGE_UI_HEKLA }}
vercel_org_id: ${{ secrets.VERCEL_ORG_ID }}
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
with:
environment: 'preview'
flags: ''
environment: "preview"
flags: ""
secrets:
vercel_project_id: ${{ secrets.VERCEL_PROJECT_ID_BRIDGE_UI_INTERNAL }}
vercel_org_id: ${{ secrets.VERCEL_ORG_ID }}
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
with:
environment: 'production'
flags: '--prod'
environment: "production"
flags: "--prod"
secrets:
vercel_project_id: ${{ secrets.VERCEL_PROJECT_ID_BRIDGE_UI_HEKLA }}
vercel_org_id: ${{ secrets.VERCEL_ORG_ID }}
Expand Down
35 changes: 35 additions & 0 deletions .github/workflows/docs-site--preview.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Docs Site Preview

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

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

jobs:
deploy-docs-site-preview:
runs-on: [taiko-runner]
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Install pnpm dependencies
uses: ./.github/actions/install-pnpm-dependencies

- name: Install Vercel CLI
run: pnpm add --global vercel@latest

- name: Pull Vercel Environment Information
run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}

- name: Build Project Artifacts
run: vercel build --token=${{ secrets.VERCEL_TOKEN }}

- name: Deploy Project Artifacts to Vercel
run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }}
32 changes: 32 additions & 0 deletions .github/workflows/docs-site--production.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Docs Site Production

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

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

jobs:
deploy-docs-site-production:
runs-on: [taiko-runner]
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Install pnpm dependencies
uses: ./.github/actions/install-pnpm-dependencies

- name: Install Vercel CLI
run: pnpm add --global vercel@latest

- name: Pull Vercel Environment Information
run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}

- name: Build Project Artifacts
run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }}

- name: Deploy Project Artifacts to Vercel
run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }}
9 changes: 1 addition & 8 deletions .github/workflows/guardians-ui-ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: Guardians UI Build and Checks

on:
workflow_call
on: workflow_call

jobs:
check-guardian-prover-health-check-ui:
Expand Down Expand Up @@ -31,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
1 change: 1 addition & 0 deletions .github/workflows/validate-pr-title.yml
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
7 changes: 4 additions & 3 deletions .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"packages/blobstorage": "0.1.0",
"packages/branding": "0.3.0",
"packages/bridge-ui": "4.2.0",
"packages/branding": "0.4.0",
"packages/bridge-ui": "2.10.1",
"packages/docs-site": "1.0.0",
"packages/eventindexer": "0.13.0",
"packages/fork-diff": "0.4.0",
"packages/fork-diff": "0.5.0",
"packages/guardian-prover-health-check": "0.1.0",
"packages/guardian-prover-health-check-ui": "0.1.0",
"packages/protocol": "1.5.0",
Expand Down
3 changes: 3 additions & 0 deletions packages/branding/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## [0.4.0](https://github.com/taikoxyz/taiko-mono/compare/branding-v0.3.0...branding-v0.4.0) (2024-05-13)


## [0.3.0](https://github.com/taikoxyz/taiko-mono/compare/branding-v0.2.0...branding-v0.3.0) (2023-08-15)


Expand Down
2 changes: 1 addition & 1 deletion packages/branding/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@taiko/branding",
"version": "0.3.0",
"version": "0.4.0",
"private": true
}
Loading

0 comments on commit db56fb3

Please sign in to comment.