From 0e67307c461851a4cd470d3625298093a9f0e0ee Mon Sep 17 00:00:00 2001 From: Mark Tyneway Date: Sun, 2 May 2021 18:31:14 -0700 Subject: [PATCH 1/4] ci: break up into multiple jobs --- .github/workflows/integration.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 01b2a3ee25719..ab21e7cc04751 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -9,13 +9,12 @@ on: workflow_dispatch: jobs: - integration: + build: runs-on: ubuntu-latest env: DOCKER_BUILDKIT: 1 COMPOSE_DOCKER_CLI_BUILD: 1 steps: - # Monorepo tests - uses: actions/checkout@v2 - name: Get yarn cache directory path @@ -34,6 +33,11 @@ jobs: working-directory: ./ops run: ./scripts/build-ci.sh + integration: + runs-on: ubuntu-latest + needs: build + steps: + # Monorepo tests - name: Bring the stack up and wait for the sequencer to be ready working-directory: ./ops run: docker-compose up -d && ./scripts/wait-for-sequencer.sh @@ -51,6 +55,10 @@ jobs: - name: Print gas report run: cat integration-tests/gas-report.txt + examples: + runs-on: ubuntu-latest + needs: build + steps: # Examples Tests - name: Test & deploy hardhat-example on hardhat (regression) working-directory: ./examples/hardhat From 3964644058524a7c5e7345da8286ebc38e2e62ca Mon Sep 17 00:00:00 2001 From: Mark Tyneway Date: Sun, 2 May 2021 18:53:24 -0700 Subject: [PATCH 2/4] ci: add in actions/checkout --- .github/workflows/integration.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index ab21e7cc04751..b79218d0f2d02 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -38,6 +38,7 @@ jobs: needs: build steps: # Monorepo tests + - uses: actions/checkout@v2 - name: Bring the stack up and wait for the sequencer to be ready working-directory: ./ops run: docker-compose up -d && ./scripts/wait-for-sequencer.sh @@ -60,6 +61,7 @@ jobs: needs: build steps: # Examples Tests + - uses: actions/checkout@v2 - name: Test & deploy hardhat-example on hardhat (regression) working-directory: ./examples/hardhat run: | From 59acbec0b2e232ffd02e1acf13ca39e77148e58e Mon Sep 17 00:00:00 2001 From: Mark Tyneway Date: Sun, 2 May 2021 19:17:06 -0700 Subject: [PATCH 3/4] github actions: install the deps --- .github/workflows/integration.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index b79218d0f2d02..cf9649e66e8d5 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -29,6 +29,7 @@ jobs: restore-keys: | ${{ runner.os }}-yarn- + - name: Build the services working-directory: ./ops run: ./scripts/build-ci.sh @@ -62,6 +63,12 @@ jobs: steps: # Examples Tests - uses: actions/checkout@v2 + + - name: Install and build hardhat example + working-directory: ./examples/hardhat + run: | + yarn + - name: Test & deploy hardhat-example on hardhat (regression) working-directory: ./examples/hardhat run: | @@ -74,11 +81,17 @@ jobs: yarn deploy:ovm yarn test:integration:ovm + - name: Install and build hardhat example + working-directory: ./examples/waffle + run: | + yarn + - name: Test & deploy waffle-example on waffle (regression) working-directory: ./examples/waffle run: | yarn compile yarn test:integration + - name: Test & deploy waffle-example on Optimism working-directory: ./examples/waffle run: | From 8a61284e859357bbe5d17047e081bbbf38c7e144 Mon Sep 17 00:00:00 2001 From: Mark Tyneway Date: Sun, 2 May 2021 19:35:35 -0700 Subject: [PATCH 4/4] github actions: make sure to build --- .github/workflows/integration.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index cf9649e66e8d5..e2c0eee3a356b 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -68,6 +68,8 @@ jobs: working-directory: ./examples/hardhat run: | yarn + yarn compile + yarn compile:ovm - name: Test & deploy hardhat-example on hardhat (regression) working-directory: ./examples/hardhat @@ -85,15 +87,15 @@ jobs: working-directory: ./examples/waffle run: | yarn + yarn compile + yarn compile:ovm - name: Test & deploy waffle-example on waffle (regression) working-directory: ./examples/waffle run: | - yarn compile yarn test:integration - name: Test & deploy waffle-example on Optimism working-directory: ./examples/waffle run: | - yarn compile:ovm yarn test:integration:ovm