Skip to content

Commit

Permalink
Merge branch 'edge' into pd-retract
Browse files Browse the repository at this point in the history
  • Loading branch information
syao1226 authored Feb 11, 2025
2 parents 04aaf56 + 731fb9e commit 9f049c5
Show file tree
Hide file tree
Showing 665 changed files with 117,324 additions and 7,638 deletions.
66 changes: 47 additions & 19 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,55 @@
version: 2.0

coverage:
status:
project:
default:
target: auto
threshold: '10'
patch:
default:
target: auto
threshold: 0

comment:
layout: 'reach, diff, flags, files'

ignore:
- '**/node_modules'
- 'webpack-config'
- 'hardware-testing'
- '**/*.md'
- '**/*.yaml'
- 'webpack-config/**'
- 'hardware-testing/**'
- 'abr-testing/**'
- 'test-data-generation/**'
- 'performance-metrics/**'
- 'package-testing/**'
- 'opentrons-ai-server/**'
- 'opentrons-ai-client/**'
- 'g-code-testing/**'
- 'api-client/**'
- 'analyses-snapshot-testing/**'
- '.storybook/**'
- 'react-api-client/**'
- 'scripts/**'
- '.github/**'
- '**/build/**'
- '**/dist/**'
- '**/node_modules/**'
- '**/{test,tests,__tests__,__mocks__,mocks}/**'
- '**/*.{md,yaml,yml,json,rst}'
- '**/Makefile'
- '**/*.in'
- '**/*.json'
- '**/*.config.js'
- '**/*.{in,ini,lock,toml,cfg}'
- '**/setup.py'
- '**/requirements.txt'
- '**/.flake8'
- '**/.coveragerc'
- '**/.prettierrc.js'
- '**/.eslintrc.js'
- '**/Pipfile'
- '**/Dockerfile*'
- '**/*.{config.js,config.ts}'
- '**/*.mk'
- '**/*.stories.tsx'

comment:
# add flags to `layout` configuration to show up in the PR comment
layout: 'reach, diff, flags, files'
- '**/*.{mjs,css,cjs,mts}'

flag_management:
default_rules:
carryforward: true

coverage:
status:
project:
default:
target: auto
threshold: 10
13 changes: 13 additions & 0 deletions .github/actions/environment/complex-variables/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: 'Set Complex Environment Variables'
description: Composite action using github-script to set complex environment variables.
inputs: {}
runs:
using: 'composite'
steps:
- name: 'Set complex environment variables'
id: set-vars
uses: actions/github-script@v7
with:
script: |
const { buildComplexEnvVars } = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/utils.js`)
buildComplexEnvVars(core, context)
17 changes: 17 additions & 0 deletions .github/actions/git/resolve-tag/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: 'Fix Checkout Tags'
description: >
Composite action to fix actions/checkout odd handling of tags
by fetching and checking out the exact tag reference.
See https://github.com/actions/checkout/issues/290
inputs: {}
runs:
using: 'composite'
steps:
- name: 'Fix actions/checkout odd handling of tags'
if: startsWith(github.ref, 'refs/tags')
shell: bash
env:
REF: ${{ github.ref }}
run: |
git fetch -f origin "${REF}:${REF}"
git checkout "${REF}"
28 changes: 28 additions & 0 deletions .github/actions/js/setup/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: 'Setup JS Environment'
description: >
Composite action to fix tag handling in checkout,
setup Node.js, install udev for USB detection, cache Yarn/NPM caches,
and perform JS setup.
inputs: {}

runs:
using: 'composite'
steps:
- uses: ./.github/actions/git/resolve-tag
- uses: ./.github/actions/environment/complex-variables
- name: 'Setup Node'
uses: actions/setup-node@v4
with:
node-version: '22.11.0'
cache: 'yarn'

- name: 'Install udev for USB-detection'
if: runner.os == 'Linux'
shell: bash
run: sudo apt-get update && sudo apt-get install libudev-dev

- name: 'Setup JS'
shell: bash
run: |
make setup-js
4 changes: 2 additions & 2 deletions .github/workflows/api-test-lint-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
lint:
name: 'opentrons package linting'
timeout-minutes: 10
runs-on: 'ubuntu-22.04'
runs-on: 'ubuntu-24.04'
steps:
- uses: 'actions/checkout@v4'
with:
Expand Down Expand Up @@ -183,7 +183,7 @@ jobs:
deploy:
name: 'deploy opentrons package'
needs: [test]
runs-on: 'ubuntu-22.04'
runs-on: 'ubuntu-24.04'
if: github.event_name == 'push'
steps:
- uses: 'actions/checkout@v4'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/app-test-build-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ env:
jobs:
js-unit-test:
# unit tests for the app's view layer (not the node layer)
runs-on: 'ubuntu-22.04'
runs-on: 'ubuntu-24.04'
name: 'opentrons app frontend unit tests'
timeout-minutes: 60
steps:
Expand Down Expand Up @@ -386,7 +386,7 @@ jobs:
deploy-release-app:
name: 'Deploy built app artifacts to S3'
runs-on: 'ubuntu-22.04'
runs-on: 'ubuntu-24.04'
needs:
['js-unit-test', 'backend-unit-test', 'build-app', 'determine-build-type']
if: contains(fromJSON(needs.determine-build-type.outputs.variants), 'release') || contains(fromJSON(needs.determine-build-type.outputs.variants), 'internal-release')
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/components-test-build-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
js-unit-test:
name: 'components unit tests'
timeout-minutes: 30
runs-on: 'ubuntu-22.04'
runs-on: 'ubuntu-24.04'
steps:
- uses: 'actions/checkout@v4'
- uses: 'actions/setup-node@v4'
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:

build-components-storybook:
name: 'build components artifact'
runs-on: 'ubuntu-22.04'
runs-on: 'ubuntu-24.04'
if: github.event_name != 'pull_request'
needs: ['js-unit-test']
steps:
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
deploy-components:
name: 'deploy components storybook artifact to S3'
runs-on: 'ubuntu-22.04'
runs-on: 'ubuntu-24.04'
needs:
['js-unit-test', 'build-components-storybook', 'determine-build-type']
if: needs.determine-build-type.outputs.type != 'none'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ defaults:
jobs:
build:
name: opentrons documentation build
runs-on: 'ubuntu-22.04'
runs-on: 'ubuntu-24.04'
steps:
- uses: 'actions/checkout@v4'
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/g-code-confirm-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
matrix:
command: ['2-modules', 'swift-smoke', 'swift-turbo', 'omega', 'fast']
name: 'Confirm G-Code (${{ matrix.command }})'
runs-on: 'ubuntu-22.04'
runs-on: 'ubuntu-24.04'
steps:
- uses: 'actions/checkout@v4'
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/g-code-testing-lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ defaults:
jobs:
lint-test:
name: 'g-code-testing package linting and tests'
runs-on: 'ubuntu-22.04'
runs-on: 'ubuntu-24.04'
steps:
- uses: 'actions/checkout@v4'
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/http-docs-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ defaults:
jobs:
build:
name: HTTP API reference build
runs-on: 'ubuntu-22.04'
runs-on: 'ubuntu-24.04'
steps:
- uses: 'actions/checkout@v4'
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/js-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ env:
jobs:
checks:
name: 'js checks'
runs-on: 'ubuntu-22.04'
runs-on: 'ubuntu-24.04'
timeout-minutes: 20
steps:
- uses: 'actions/checkout@v4'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ll-test-build-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
js-unit-test:
name: 'labware library unit tests'
timeout-minutes: 20
runs-on: 'ubuntu-22.04'
runs-on: 'ubuntu-24.04'
steps:
- uses: 'actions/checkout@v4'
- uses: 'actions/setup-node@v4'
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
name: 'labware library e2e tests'
needs: ['js-unit-test']
timeout-minutes: 30
runs-on: 'ubuntu-22.04'
runs-on: 'ubuntu-24.04'
steps:
- uses: 'actions/checkout@v4'
# https://github.com/actions/checkout/issues/290
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
name: 'build labware library artifact'
needs: ['js-unit-test']
timeout-minutes: 30
runs-on: 'ubuntu-22.04'
runs-on: 'ubuntu-24.04'
if: github.event_name != 'pull_request'
steps:
- uses: 'actions/checkout@v4'
Expand Down Expand Up @@ -170,7 +170,7 @@ jobs:
path: labware-library/dist
deploy-ll:
name: 'deploy LL artifact to S3'
runs-on: 'ubuntu-22.04'
runs-on: 'ubuntu-24.04'
needs: ['js-unit-test', 'e2e-test', 'build-ll']
if: github.event_name != 'pull_request'
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:

jobs:
js-unit-test:
runs-on: 'ubuntu-22.04'
runs-on: 'ubuntu-24.04'
permissions:
id-token: write
contents: read
Expand Down Expand Up @@ -53,8 +53,8 @@ jobs:
make setup-js
- name: 'build'
env:
# inject dev id since this is for staging
OT_AI_CLIENT_MIXPANEL_ID: ${{ secrets.OT_AI_CLIENT_MIXPANEL_DEV_ID }}
# inject dev id since this is for staging
OT_AI_CLIENT_MIXPANEL_ID: ${{ secrets.OT_AI_CLIENT_MIXPANEL_DEV_ID }}
run: |
make -C opentrons-ai-client build-staging
- name: Configure AWS Credentials
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/opentrons-ai-client-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ env:

jobs:
js-unit-test:
runs-on: 'ubuntu-22.04'
runs-on: 'ubuntu-24.04'
name: 'opentrons ai frontend unit tests'
timeout-minutes: 60
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/opentrons-ai-production-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
concurrency:
group: ${{ github.workflow }}-ai-client@
cancel-in-progress: true
runs-on: 'ubuntu-22.04'
runs-on: 'ubuntu-24.04'
permissions:
id-token: write
contents: read
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
make setup-js
- name: 'build'
env:
OT_AI_CLIENT_MIXPANEL_ID: ${{ secrets.OT_AI_CLIENT_MIXPANEL_ID }}
OT_AI_CLIENT_MIXPANEL_ID: ${{ secrets.OT_AI_CLIENT_MIXPANEL_ID }}
run: |
make -C opentrons-ai-client build-production
- name: Configure AWS Credentials
Expand Down
Loading

0 comments on commit 9f049c5

Please sign in to comment.