Skip to content

Commit

Permalink
Merge tag 'op-node/v1.3.0' into feat/upstream-op-v1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Pangssu committed Jan 17, 2024
2 parents 9d5e944 + 96a24cc commit b2e2a80
Show file tree
Hide file tree
Showing 327 changed files with 39,868 additions and 167,805 deletions.
1 change: 1 addition & 0 deletions .foundryrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ee5d02c3ef5f55a06b069e4a70a820661a9130c8
1 change: 1 addition & 0 deletions .gethrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v1.13.4
47 changes: 22 additions & 25 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: ci
on:
push:
branches:
- dev
- dev
tags:
- '*.*.*'

Expand Down Expand Up @@ -33,39 +33,38 @@ jobs:
go-version: '1.21'
- run: go mod download

- name: Setup Node.js 16.x
uses: actions/setup-node@master
- name: Setup Node.js 20
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 20

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: pnpm/action-setup@v2
name: Install pnpm
with:
version: 8
run_install: false

- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- name: Yarn Cache
uses: actions/cache@v3
id: yarn-cache
- uses: actions/cache@v3
name: Setup pnpm cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-yarn-
${{ runner.os }}-pnpm-store-
- name: Install Dependencies
run: yarn --frozen-lockfile
- name: Install dependencies
run: pnpm install

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
with:
version: nightly-d369d2486f85576eec4ca41d277391dfdae21ba7

- name: Build
run: yarn build

- name: Run Tests
env:
E2E_DISABLE_PARALLEL: true
run: make test
run: pnpm build

- name: Docker Image Name
id: docker-image-name
Expand Down Expand Up @@ -169,5 +168,3 @@ jobs:
target: op-batcher
push: true
tags: kromanetwork/batcher:${{ needs.prepare.outputs.docker-tag }}


48 changes: 28 additions & 20 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: Tests
on:
pull_request:
branches:
- dev
- main
- dev
- main

jobs:
test:
Expand All @@ -24,36 +24,44 @@ jobs:
go-version: '1.21'
- run: go mod download

- name: Setup Node.js 16.x
uses: actions/setup-node@master
- name: Setup Node.js using .nvmrc
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version-file: .nvmrc

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: pnpm/action-setup@v2
name: Install pnpm
with:
version: 8
run_install: false

- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- name: Yarn Cache
uses: actions/cache@v3
id: yarn-cache
- uses: actions/cache@v3
name: Setup pnpm cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-yarn-
${{ runner.os }}-pnpm-store-
- name: Install Dependencies
run: yarn --frozen-lockfile
- name: Install dependencies
run: pnpm install

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
with:
version: nightly-d369d2486f85576eec4ca41d277391dfdae21ba7

- name: Build
run: yarn build
run: pnpm build

- name: Generate L1 allocs
run: make devnet-allocs

- name: Run tests
env:
E2E_DISABLE_PARALLEL: true
OP_E2E_DISABLE_PARALLEL: true
OP_E2E_USE_CANYON: true
run: make test
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -350,5 +350,3 @@ coverage.out

# Ignore bedrock go bindings local output files
op-bindings/bin

__pycache__
5 changes: 5 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# run prefoo scripts
# npm and yarn support this as a default pnpm defaults to false
enable-pre-post-scripts=true
lockfile=true
prefer-workspace-packages=true
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v16.16.0
v20.9.0
Loading

0 comments on commit b2e2a80

Please sign in to comment.