Skip to content

Commit 1bc8b46

Browse files
committed
Merge branch 'edge' into hardware-testing-dvt-tof-validation-data-consolidate
2 parents 0a222ca + 1055859 commit 1bc8b46

File tree

268 files changed

+20652
-2252
lines changed

Some content is hidden

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

268 files changed

+20652
-2252
lines changed

.eslintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ analyses-snapshot-testing/tests/__snapshots__
4040
analyses-snapshot-testing/analysis_results
4141

4242
opentrons-ai-server/package
43-
opentrons-ai-server/api/storage/index/
43+
opentrons-ai-server/api/storage/
4444

4545
# Leave Markdown formatting alone because some of it is load-bearing for MkDocs.
4646
# Note that this is a Prettier thing, not an ESLint thing. Prettier shares this config file.

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

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,20 @@ jobs:
8686
NODE_OPTIONS: '--max-old-space-size=5120'
8787
OT_PD_MIXPANEL_ID: ${{ secrets.OT_PD_MIXPANEL_ID }}
8888
OT_PD_MIXPANEL_DEV_ID: ${{ secrets.OT_PD_MIXPANEL_DEV_ID }}
89-
# OT_PD_SENTRY_DSN: ${{ secrets.OT_PD_SENTRY_DSN }}
90-
# OT_PD_SENTRY_DEV_DSN: ${{ secrets.OT_PD_SENTRY_DEV_DSN }}
89+
OT_PD_SENTRY_DSN: ${{ secrets.OT_PD_SENTRY_DSN }}
90+
OT_PD_SENTRY_DEV_DSN: ${{ secrets.OT_PD_SENTRY_DEV_DSN }}
9191
run: |
9292
make -C protocol-designer NODE_ENV=development
93-
# - name: 'upload sourcemaps to Sentry'
94-
# uses: getsentry/action-release@v3
95-
# env:
96-
# SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
97-
# SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
98-
# SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
99-
# with:
100-
# sourcemaps: protocol-designer/dist
93+
- name: 'upload sourcemaps to Sentry'
94+
uses: getsentry/action-release@v3
95+
env:
96+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
97+
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
98+
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
99+
with:
100+
sourcemaps: protocol-designer/dist
101+
set_commits: auto
102+
ignore_missing: true
101103
- name: 'upload github artifact'
102104
uses: actions/upload-artifact@v4
103105
with:
@@ -138,12 +140,12 @@ jobs:
138140
# invalidate both sandbox.opentrons.com and www.sandbox.opentrons.com cloudfront caches
139141
aws cloudfront create-invalidation --distribution-id ${{ secrets.PD_CLOUDFRONT_SANDBOX_DISTRIBUTION_ID }} --paths "/*"
140142
aws cloudfront create-invalidation --distribution-id ${{ secrets.PD_CLOUDFRONT_SANDBOX_WWW_DISTRIBUTION_ID }} --paths "/*"
141-
# - name: 'notify Sentry of prod deploy'
142-
# uses: getsentry/action-release@v3
143-
# env:
144-
# SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
145-
# SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
146-
# SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
147-
# with:
148-
# version: ${{ steps.resolve-tag.outputs.tag }}
149-
# environment: production
143+
- name: 'notify Sentry of prod deploy'
144+
uses: getsentry/action-release@v3
145+
env:
146+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
147+
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
148+
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
149+
with:
150+
version: ${{ steps.resolve-tag.outputs.tag }}
151+
environment: production
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
{
2+
"ordering": [],
3+
"brand": {
4+
"brand": "Millipore",
5+
"brandId": []
6+
},
7+
"metadata": {
8+
"displayName": "Millipore 24 Ball Magnet",
9+
"displayCategory": "adapter",
10+
"displayVolumeUnits": "µL",
11+
"tags": []
12+
},
13+
"dimensions": {
14+
"xDimension": 127.8,
15+
"yDimension": 85.6,
16+
"zDimension": 11.15
17+
},
18+
"wells": {},
19+
"groups": [
20+
{
21+
"metadata": {},
22+
"wells": []
23+
}
24+
],
25+
"parameters": {
26+
"format": "96Standard",
27+
"quirks": [],
28+
"isTiprack": false,
29+
"isMagneticModuleCompatible": false,
30+
"loadName": "millipore_24_ball_magnet"
31+
},
32+
"namespace": "custom_beta",
33+
"version": 2,
34+
"schemaVersion": 2,
35+
"allowedRoles": ["adapter"],
36+
"cornerOffsetFromSlot": {
37+
"x": 0,
38+
"y": 0,
39+
"z": 0
40+
},
41+
"gripperOffsets": {
42+
"default": {
43+
"pickUpOffset": {
44+
"x": 0,
45+
"y": 0,
46+
"z": 0
47+
},
48+
"dropOffset": {
49+
"x": 0,
50+
"y": 0,
51+
"z": 0.5
52+
}
53+
}
54+
}
55+
}

0 commit comments

Comments
 (0)