Skip to content

Commit

Permalink
Merge branch 'main' into docs-addition
Browse files Browse the repository at this point in the history
  • Loading branch information
RogerLamTd authored Feb 4, 2025
2 parents c089c14 + 02ae1cf commit 870f6de
Show file tree
Hide file tree
Showing 465 changed files with 41,469 additions and 28,647 deletions.
22 changes: 21 additions & 1 deletion .github/workflows/protocol.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ on:
- "!packages/protocol/docs/**"
- "!packages/protocol/simulation/**"
- "!packages/protocol/deployments/**"
- "!packages/protocol/script/layer2/hekla/**"
- "!packages/protocol/script/layer2/mainnet/**"
- "!packages/protocol/script/layer1/hekla/**"
- "!packages/protocol/script/layer1/mainnet/**"
- "!packages/protocol/script/layer1/preconf/**"
- "!packages/protocol/script/layer1/provers/**"
- "!packages/protocol/script/layer1/team/**"
branches-ignore:
- release-please--branches--**

Expand Down Expand Up @@ -37,6 +44,8 @@ jobs:

- name: Install Foundry
uses: foundry-rs/[email protected]
with:
version: stable

- name: Install pnpm dependencies
uses: ./.github/actions/install-pnpm-dependencies
Expand All @@ -53,7 +62,18 @@ jobs:
working-directory: ./packages/protocol
run: pnpm compile:l1 && pnpm test:l1 && pnpm layout:l1

- name: Check for changes
id: git_status
run: |
git add -N . # Simulate staging to detect untracked files
if [ -n "$(git status --porcelain)" ]; then
echo "changes=true" >> $GITHUB_ENV
else
echo "changes=false" >> $GITHUB_ENV
fi
- name: Commit contract layout table
if: env.changes == 'true'
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: "forge fmt & update contract layout tables"
Expand Down Expand Up @@ -86,7 +106,7 @@ jobs:
submodules: recursive

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1.2.0
uses: foundry-rs/foundry-toolchain@v1.3.1

- name: Install pnpm dependencies
uses: ./.github/actions/install-pnpm-dependencies
Expand Down
40 changes: 40 additions & 0 deletions .github/workflows/taiko-client--pages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: "Taiko Client Soft Blocks Documentation"

on:
push:
branches: [main]
paths:
- "packages/taiko-client/**"

jobs:
generate-and-deploy:
runs-on: [arc-runner-set]
permissions:
contents: write
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: "1.23"

- name: Install swaggo
run: |
export CGO_ENABLED=0
go install github.com/swaggo/swag/cmd/swag@latest
- name: Generate Swagger documentation
run: |
export CGO_ENABLED=0
cd packages/taiko-client
./scripts/gen_swagger_json.sh
- name: Deploy to GitHub Pages
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: packages/taiko-client/docs # Set this to where your `index.html` is located
publish_branch: gh-pages
destination_dir: preconf_blocks_api
16 changes: 14 additions & 2 deletions .github/workflows/taiko-client--test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ jobs:
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') }}
name: Integration tests
runs-on: [ubuntu-latest]
timeout-minutes: 15
timeout-minutes: 30
env:
OLD_FORK_TAIKO_MONO_DIR: old-fork-taiko-mono

strategy:
matrix:
Expand All @@ -62,11 +64,21 @@ jobs:
- name: Install pnpm dependencies
uses: ./.github/actions/install-pnpm-dependencies

- uses: actions/checkout@v4
with:
repository: taikoxyz/taiko-mono
path: ${{ env.OLD_FORK_TAIKO_MONO_DIR }}
ref: protocol-v1.11.0

- name: Install pnpm dependencies for old fork taiko-mono
working-directory: ${{ env.OLD_FORK_TAIKO_MONO_DIR }}
run: cd ./packages/protocol && pnpm install

- name: Run Tests on ${{ matrix.execution_node }} execution engine
working-directory: packages/taiko-client
env:
L2_NODE: ${{ matrix.execution_node }}
run: make test
run: OLD_FORK_TAIKO_MONO=${GITHUB_WORKSPACE}/${OLD_FORK_TAIKO_MONO_DIR} make test

- name: Codecov.io
uses: codecov/codecov-action@v5
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,4 @@ __pycache__/

# Idea
.idea/
packages/protocol/snapshots/InboxTest_ProposeAndProve.json
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"packages/fork-diff": "0.6.1",
"packages/guardian-prover-health-check": "0.1.0",
"packages/guardian-prover-health-check-ui": "0.2.0",
"packages/protocol": "1.12.0",
"packages/protocol": "2.0.0",
"packages/relayer": "0.12.0",
"packages/snaefell-ui": "1.1.0",
"packages/supplementary-contracts": "1.0.0",
Expand Down
Loading

0 comments on commit 870f6de

Please sign in to comment.