Skip to content

Commit cd1aadf

Browse files
Merge branch 'edge' into identify_labware_defs
2 parents ed3456a + 5da85c3 commit cd1aadf

File tree

236 files changed

+5211
-3045
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+5211
-3045
lines changed

.codecov.yml

+47-19
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,55 @@
1+
version: 2.0
2+
3+
coverage:
4+
status:
5+
project:
6+
default:
7+
target: auto
8+
threshold: '10'
9+
patch:
10+
default:
11+
target: auto
12+
threshold: 0
13+
14+
comment:
15+
layout: 'reach, diff, flags, files'
16+
117
ignore:
2-
- '**/node_modules'
3-
- 'webpack-config'
4-
- 'hardware-testing'
5-
- '**/*.md'
6-
- '**/*.yaml'
18+
- 'webpack-config/**'
19+
- 'hardware-testing/**'
20+
- 'abr-testing/**'
21+
- 'test-data-generation/**'
22+
- 'performance-metrics/**'
23+
- 'package-testing/**'
24+
- 'opentrons-ai-server/**'
25+
- 'opentrons-ai-client/**'
26+
- 'g-code-testing/**'
27+
- 'api-client/**'
28+
- 'analyses-snapshot-testing/**'
29+
- '.storybook/**'
30+
- 'react-api-client/**'
31+
- 'scripts/**'
32+
- '.github/**'
33+
- '**/build/**'
34+
- '**/dist/**'
35+
- '**/node_modules/**'
36+
- '**/{test,tests,__tests__,__mocks__,mocks}/**'
37+
- '**/*.{md,yaml,yml,json,rst}'
738
- '**/Makefile'
8-
- '**/*.in'
9-
- '**/*.json'
10-
- '**/*.config.js'
39+
- '**/*.{in,ini,lock,toml,cfg}'
40+
- '**/setup.py'
41+
- '**/requirements.txt'
42+
- '**/.flake8'
43+
- '**/.coveragerc'
44+
- '**/.prettierrc.js'
45+
- '**/.eslintrc.js'
46+
- '**/Pipfile'
47+
- '**/Dockerfile*'
48+
- '**/*.{config.js,config.ts}'
1149
- '**/*.mk'
1250
- '**/*.stories.tsx'
13-
14-
comment:
15-
# add flags to `layout` configuration to show up in the PR comment
16-
layout: 'reach, diff, flags, files'
51+
- '**/*.{mjs,css,cjs,mts}'
1752

1853
flag_management:
1954
default_rules:
2055
carryforward: true
21-
22-
coverage:
23-
status:
24-
project:
25-
default:
26-
target: auto
27-
threshold: 10

.github/workflows/api-test-lint-deploy.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
lint:
5050
name: 'opentrons package linting'
5151
timeout-minutes: 10
52-
runs-on: 'ubuntu-22.04'
52+
runs-on: 'ubuntu-24.04'
5353
steps:
5454
- uses: 'actions/checkout@v4'
5555
with:
@@ -183,7 +183,7 @@ jobs:
183183
deploy:
184184
name: 'deploy opentrons package'
185185
needs: [test]
186-
runs-on: 'ubuntu-22.04'
186+
runs-on: 'ubuntu-24.04'
187187
if: github.event_name == 'push'
188188
steps:
189189
- uses: 'actions/checkout@v4'

.github/workflows/app-test-build-deploy.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ env:
5252
jobs:
5353
js-unit-test:
5454
# unit tests for the app's view layer (not the node layer)
55-
runs-on: 'ubuntu-22.04'
55+
runs-on: 'ubuntu-24.04'
5656
name: 'opentrons app frontend unit tests'
5757
timeout-minutes: 60
5858
steps:
@@ -386,7 +386,7 @@ jobs:
386386
387387
deploy-release-app:
388388
name: 'Deploy built app artifacts to S3'
389-
runs-on: 'ubuntu-22.04'
389+
runs-on: 'ubuntu-24.04'
390390
needs:
391391
['js-unit-test', 'backend-unit-test', 'build-app', 'determine-build-type']
392392
if: contains(fromJSON(needs.determine-build-type.outputs.variants), 'release') || contains(fromJSON(needs.determine-build-type.outputs.variants), 'internal-release')

.github/workflows/components-test-build-deploy.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
js-unit-test:
4242
name: 'components unit tests'
4343
timeout-minutes: 30
44-
runs-on: 'ubuntu-22.04'
44+
runs-on: 'ubuntu-24.04'
4545
steps:
4646
- uses: 'actions/checkout@v4'
4747
- uses: 'actions/setup-node@v4'
@@ -75,7 +75,7 @@ jobs:
7575

7676
build-components-storybook:
7777
name: 'build components artifact'
78-
runs-on: 'ubuntu-22.04'
78+
runs-on: 'ubuntu-24.04'
7979
if: github.event_name != 'pull_request'
8080
needs: ['js-unit-test']
8181
steps:
@@ -135,7 +135,7 @@ jobs:
135135
136136
deploy-components:
137137
name: 'deploy components storybook artifact to S3'
138-
runs-on: 'ubuntu-22.04'
138+
runs-on: 'ubuntu-24.04'
139139
needs:
140140
['js-unit-test', 'build-components-storybook', 'determine-build-type']
141141
if: needs.determine-build-type.outputs.type != 'none'

.github/workflows/docs-build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ defaults:
3838
jobs:
3939
build:
4040
name: opentrons documentation build
41-
runs-on: 'ubuntu-22.04'
41+
runs-on: 'ubuntu-24.04'
4242
steps:
4343
- uses: 'actions/checkout@v4'
4444
with:

.github/workflows/g-code-confirm-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
matrix:
3434
command: ['2-modules', 'swift-smoke', 'swift-turbo', 'omega', 'fast']
3535
name: 'Confirm G-Code (${{ matrix.command }})'
36-
runs-on: 'ubuntu-22.04'
36+
runs-on: 'ubuntu-24.04'
3737
steps:
3838
- uses: 'actions/checkout@v4'
3939
with:

.github/workflows/g-code-testing-lint-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ defaults:
4040
jobs:
4141
lint-test:
4242
name: 'g-code-testing package linting and tests'
43-
runs-on: 'ubuntu-22.04'
43+
runs-on: 'ubuntu-24.04'
4444
steps:
4545
- uses: 'actions/checkout@v4'
4646
with:

.github/workflows/http-docs-build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ defaults:
3838
jobs:
3939
build:
4040
name: HTTP API reference build
41-
runs-on: 'ubuntu-22.04'
41+
runs-on: 'ubuntu-24.04'
4242
steps:
4343
- uses: 'actions/checkout@v4'
4444
with:

.github/workflows/js-check.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ env:
3939
jobs:
4040
checks:
4141
name: 'js checks'
42-
runs-on: 'ubuntu-22.04'
42+
runs-on: 'ubuntu-24.04'
4343
timeout-minutes: 20
4444
steps:
4545
- uses: 'actions/checkout@v4'

.github/workflows/ll-test-build-deploy.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
js-unit-test:
4141
name: 'labware library unit tests'
4242
timeout-minutes: 20
43-
runs-on: 'ubuntu-22.04'
43+
runs-on: 'ubuntu-24.04'
4444
steps:
4545
- uses: 'actions/checkout@v4'
4646
- uses: 'actions/setup-node@v4'
@@ -83,7 +83,7 @@ jobs:
8383
name: 'labware library e2e tests'
8484
needs: ['js-unit-test']
8585
timeout-minutes: 30
86-
runs-on: 'ubuntu-22.04'
86+
runs-on: 'ubuntu-24.04'
8787
steps:
8888
- uses: 'actions/checkout@v4'
8989
# https://github.com/actions/checkout/issues/290
@@ -123,7 +123,7 @@ jobs:
123123
name: 'build labware library artifact'
124124
needs: ['js-unit-test']
125125
timeout-minutes: 30
126-
runs-on: 'ubuntu-22.04'
126+
runs-on: 'ubuntu-24.04'
127127
if: github.event_name != 'pull_request'
128128
steps:
129129
- uses: 'actions/checkout@v4'
@@ -170,7 +170,7 @@ jobs:
170170
path: labware-library/dist
171171
deploy-ll:
172172
name: 'deploy LL artifact to S3'
173-
runs-on: 'ubuntu-22.04'
173+
runs-on: 'ubuntu-24.04'
174174
needs: ['js-unit-test', 'e2e-test', 'build-ll']
175175
if: github.event_name != 'pull_request'
176176
steps:

.github/workflows/opentrons-ai-client-staging-continuous-deploy.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616

1717
jobs:
1818
js-unit-test:
19-
runs-on: 'ubuntu-22.04'
19+
runs-on: 'ubuntu-24.04'
2020
permissions:
2121
id-token: write
2222
contents: read
@@ -53,8 +53,8 @@ jobs:
5353
make setup-js
5454
- name: 'build'
5555
env:
56-
# inject dev id since this is for staging
57-
OT_AI_CLIENT_MIXPANEL_ID: ${{ secrets.OT_AI_CLIENT_MIXPANEL_DEV_ID }}
56+
# inject dev id since this is for staging
57+
OT_AI_CLIENT_MIXPANEL_ID: ${{ secrets.OT_AI_CLIENT_MIXPANEL_DEV_ID }}
5858
run: |
5959
make -C opentrons-ai-client build-staging
6060
- name: Configure AWS Credentials

.github/workflows/opentrons-ai-client-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ env:
3535

3636
jobs:
3737
js-unit-test:
38-
runs-on: 'ubuntu-22.04'
38+
runs-on: 'ubuntu-24.04'
3939
name: 'opentrons ai frontend unit tests'
4040
timeout-minutes: 60
4141
steps:

.github/workflows/opentrons-ai-production-deploy.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
concurrency:
1717
group: ${{ github.workflow }}-ai-client@
1818
cancel-in-progress: true
19-
runs-on: 'ubuntu-22.04'
19+
runs-on: 'ubuntu-24.04'
2020
permissions:
2121
id-token: write
2222
contents: read
@@ -53,7 +53,7 @@ jobs:
5353
make setup-js
5454
- name: 'build'
5555
env:
56-
OT_AI_CLIENT_MIXPANEL_ID: ${{ secrets.OT_AI_CLIENT_MIXPANEL_ID }}
56+
OT_AI_CLIENT_MIXPANEL_ID: ${{ secrets.OT_AI_CLIENT_MIXPANEL_ID }}
5757
run: |
5858
make -C opentrons-ai-client build-production
5959
- name: Configure AWS Credentials

.github/workflows/react-api-client-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
js-unit-test:
3535
name: 'api-client and react-api-client unit tests'
3636
timeout-minutes: 30
37-
runs-on: 'ubuntu-22.04'
37+
runs-on: 'ubuntu-24.04'
3838
steps:
3939
- uses: 'actions/checkout@v4'
4040
- uses: 'actions/setup-node@v4'

.github/workflows/robot-server-lint-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
lint-test:
5252
name: 'robot server package linting and tests'
5353
timeout-minutes: 40
54-
runs-on: 'ubuntu-22.04'
54+
runs-on: 'ubuntu-24.04'
5555
strategy:
5656
matrix:
5757
with-ot-hardware: ['true', 'false']

.github/workflows/server-utils-lint-test.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
lint:
4040
name: 'server-utils linting'
4141
timeout-minutes: 10
42-
runs-on: 'ubuntu-22.04'
42+
runs-on: 'ubuntu-24.04'
4343
steps:
4444
- uses: 'actions/checkout@v4'
4545
with:
@@ -60,7 +60,7 @@ jobs:
6060
name: 'server-utils package tests'
6161
timeout-minutes: 10
6262
needs: [lint]
63-
runs-on: 'ubuntu-22.04'
63+
runs-on: 'ubuntu-24.04'
6464
steps:
6565
- uses: 'actions/checkout@v4'
6666
with:

.github/workflows/shared-data-test-lint-deploy.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
python-lint:
4545
name: 'shared-data package python lint'
4646
timeout-minutes: 10
47-
runs-on: 'ubuntu-22.04'
47+
runs-on: 'ubuntu-24.04'
4848
steps:
4949
- uses: 'actions/checkout@v4'
5050
with:
@@ -112,7 +112,7 @@ jobs:
112112

113113
js-test:
114114
name: 'shared-data JS tests'
115-
runs-on: 'ubuntu-22.04'
115+
runs-on: 'ubuntu-24.04'
116116
timeout-minutes: 30
117117
steps:
118118
- uses: 'actions/checkout@v4'
@@ -149,7 +149,7 @@ jobs:
149149
python-deploy:
150150
name: 'shared-data package deploy'
151151
needs: [python-test]
152-
runs-on: 'ubuntu-22.04'
152+
runs-on: 'ubuntu-24.04'
153153
if: github.event_name == 'push'
154154
steps:
155155
- uses: 'actions/checkout@v4'

.github/workflows/step-generation-test.yaml

+13-27
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,18 @@ on:
99
- 'shared-data/**'
1010
- 'package.json'
1111
- '.github/workflows/step-generation-test.yaml'
12+
- '.github/actions/js/setup/action.yml'
13+
- '.github/actions/git/resolve-tag/action.yml'
14+
- '.github/actions/environment/complex-variables/action.yml'
1215
push:
1316
paths:
1417
- 'step-generation/**'
1518
- 'shared-data/**'
1619
- 'package.json'
1720
- '.github/workflows/step-generation-test.yaml'
21+
- '.github/actions/js/setup/action.yml'
22+
- '.github/actions/git/resolve-tag/action.yml'
23+
- '.github/actions/environment/complex-variables/action.yml'
1824
branches:
1925
- '*'
2026

@@ -32,36 +38,16 @@ env:
3238
jobs:
3339
js-unit-test:
3440
name: 'step generation unit tests'
35-
runs-on: 'ubuntu-22.04'
36-
timeout-minutes: 30
41+
runs-on: 'ubuntu-24.04'
42+
timeout-minutes: 20
3743
steps:
38-
- uses: 'actions/checkout@v4'
39-
- uses: 'actions/setup-node@v4'
40-
with:
41-
node-version: '22.11.0'
42-
- name: 'install udev for usb-detection'
43-
run: |
44-
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
45-
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
46-
sudo apt-get update && sudo apt-get install libudev-dev
47-
- name: 'cache yarn cache'
48-
uses: actions/cache@v3
49-
with:
50-
path: |
51-
${{ github.workspace }}/.yarn-cache
52-
${{ github.workspace }}/.npm-cache
53-
key: js-${{ secrets.GH_CACHE_VERSION }}-${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
54-
restore-keys: |
55-
js-${{ secrets.GH_CACHE_VERSION }}-${{ runner.os }}-yarn-
56-
- name: 'setup-js'
57-
run: |
58-
npm config set cache ./.npm-cache
59-
yarn config set cache-folder ./.yarn-cache
60-
make setup-js
44+
- name: 'Checkout Repository'
45+
uses: actions/checkout@v4
46+
- uses: ./.github/actions/js/setup
6147
- name: 'run step generation unit tests'
6248
run: make -C step-generation test-cov
6349
- name: 'Upload coverage report'
64-
uses: codecov/codecov-action@v3
50+
uses: codecov/codecov-action@v5
6551
with:
66-
files: ./coverage/lcov.info
6752
flags: step-generation
53+
token: ${{ secrets.CODECOV_TOKEN }}

0 commit comments

Comments
 (0)