Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci(js): gate expensive e2e matrices and builds on unit test pass #9908

Merged
merged 3 commits into from
Apr 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/app-test-build-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
- '.github/workflows/app-test-build-deploy.yaml'
- '.github/workflows/utils.js'
branches:
- '*'
- '**'
tags:
- 'v*'
pull_request:
Expand Down Expand Up @@ -91,6 +91,7 @@ jobs:
matrix:
os: ['windows-2019', 'ubuntu-18.04', 'macos-latest']
name: 'opentrons app backend unit tests and build'
needs: ['js-unit-test']
runs-on: ${{ matrix.os }}
steps:
- uses: 'actions/checkout@v2'
Expand Down Expand Up @@ -131,6 +132,7 @@ jobs:
# build the app and deploy it
- if: github.event_name != 'pull_request'
name: 'build app for ${{ matrix.os }}'
timeout-minutes: 60
env:
OT_APP_MIXPANEL_ID: ${{ secrets.OT_APP_MIXPANEL_ID }}
OT_APP_INTERCOM_ID: ${{ secrets.OT_APP_INTERCOM_ID }}
Expand All @@ -153,7 +155,7 @@ jobs:
deploy-app:
name: 'Deploy built app artifacts to S3'
runs-on: 'ubuntu-18.04'
needs: build-app-test-backend
needs: ['js-unit-test', 'build-app-test-backend']
if: github.event_name != 'pull_request'
steps:
- name: 'download run app builds'
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/components-test-build-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
- 'package.json'
- '.github/workflows/components-test-build-deploy.yaml'
branches:
- '*'
- '**'
tags:
- 'components*'
workflow_dispatch:
Expand Down Expand Up @@ -63,11 +63,12 @@ jobs:
with:
files: ./coverage/lcov.info
flags: components

build-components:
name: 'build components artifact'
runs-on: 'ubuntu-18.04'
if: github.event_name != 'pull_request'
needs: ['js-unit-test']
steps:
- uses: 'actions/checkout@v2'
- uses: 'actions/setup-node@v1'
Expand Down
63 changes: 0 additions & 63 deletions .github/workflows/labware-library-e2e-test.yaml

This file was deleted.

6 changes: 4 additions & 2 deletions .github/workflows/ll-test-build-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
- 'package.json'
- '.github/workflows/ll-test-build-deploy.yaml'
branches:
- '*'
- '**'
tags:
- 'labware-library*'
workflow_dispatch:
Expand Down Expand Up @@ -69,6 +69,7 @@ jobs:

e2e-test:
name: 'labware library e2e tests on ${{ matrix.os }}'
needs: ['js-unit-test']
timeout-minutes: 30
strategy:
matrix:
Expand Down Expand Up @@ -103,6 +104,7 @@ jobs:
run: make -C labware-library test-e2e
build-ll:
name: 'build labware library artifact'
needs: ['js-unit-test']
runs-on: 'ubuntu-18.04'
if: github.event_name != 'pull_request'
steps:
Expand Down Expand Up @@ -140,7 +142,7 @@ jobs:
deploy-ll:
name: 'deploy LL artifact to S3'
runs-on: 'ubuntu-18.04'
needs: ["js-unit-test", "e2e-test", "build-ll"]
needs: ['js-unit-test', 'e2e-test', 'build-ll']
if: github.event_name != 'pull_request'
steps:
- uses: 'actions/checkout@v2'
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/pd-test-build-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
- 'package.json'
- '.github/workflows/pd-test-build-deploy.yaml'
branches:
- '*'
- '**'
tags:
- 'protocol-designer*'
workflow_dispatch:
Expand Down Expand Up @@ -68,9 +68,10 @@ jobs:
with:
files: ./coverage/lcov.info
flags: protocol-designer

e2e-test:
name: 'pd e2e tests'
needs: ['js-unit-test']
timeout-minutes: 30
strategy:
matrix:
Expand Down Expand Up @@ -102,6 +103,7 @@ jobs:
run: make -C protocol-designer test-e2e
build-pd:
name: 'build protocol designer artifact'
needs: ['js-unit-test']
runs-on: 'ubuntu-18.04'
if: github.event_name != 'pull_request'
steps:
Expand Down Expand Up @@ -139,7 +141,7 @@ jobs:
deploy-pd:
name: 'deploy PD artifact to S3'
runs-on: 'ubuntu-18.04'
needs: ["js-unit-test", "build-pd"]
needs: ['js-unit-test', 'build-pd']
if: github.event_name != 'pull_request'
steps:
- uses: 'actions/checkout@v2'
Expand Down