Skip to content

Commit 8e84f69

Browse files
kojikoji
committed
Merge branch 'edge' into style_update-stylelint-to-the-latest
2 parents e161ec6 + 13e6b75 commit 8e84f69

File tree

364 files changed

+9278
-4131
lines changed

Some content is hidden

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

364 files changed

+9278
-4131
lines changed

‎.github/workflows/abr-testing-lint-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
with:
4141
fetch-depth: 0
4242
- name: Setup Node
43-
uses: 'actions/setup-node@v4'
43+
uses: 'actions/setup-node@v6'
4444
with:
4545
node-version: '12'
4646
- name: Setup Python

‎.github/workflows/analyses-snapshot-test.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
matrix_json: ${{ steps.set-matrix.outputs.json }}
4141
steps:
4242
- name: Checkout Repository
43-
uses: actions/checkout@v4
43+
uses: actions/checkout@v5
4444
- name: Setup UV
4545
uses: astral-sh/setup-uv@v6
4646
with:
@@ -67,7 +67,7 @@ jobs:
6767
if: github.event_name == 'pull_request'
6868
steps:
6969
- name: Checkout Repository
70-
uses: actions/checkout@v4
70+
uses: actions/checkout@v5
7171
- name: Are the analyses snapshots in my PR branch in sync with the target branch?
7272
if: github.event_name == 'pull_request'
7373
run: |
@@ -95,7 +95,7 @@ jobs:
9595
runs-on: ubuntu-latest
9696
steps:
9797
- name: Checkout Repository
98-
uses: actions/checkout@v4
98+
uses: actions/checkout@v5
9999
- name: Setup UV
100100
uses: astral-sh/setup-uv@v6
101101
with:
@@ -132,7 +132,7 @@ jobs:
132132
PR_TARGET_BRANCH: ${{ github.event.pull_request.base.ref || 'edge'}}
133133
steps:
134134
- name: Checkout Repository
135-
uses: actions/checkout@v4
135+
uses: actions/checkout@v5
136136
- name: Setup UV
137137
uses: astral-sh/setup-uv@v6
138138
with:

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
- uses: 'actions/checkout@v4'
5656
with:
5757
fetch-depth: 0
58-
- uses: 'actions/setup-node@v4'
58+
- uses: 'actions/setup-node@v6'
5959
with:
6060
node-version: '22.12.0'
6161
- uses: 'actions/setup-python@v4'
@@ -92,7 +92,7 @@ jobs:
9292
run: |
9393
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
9494
git checkout ${{ github.ref }}
95-
- uses: 'actions/setup-node@v4'
95+
- uses: 'actions/setup-node@v6'
9696
with:
9797
node-version: '22.12.0'
9898
- uses: 'actions/setup-python@v4'
@@ -187,8 +187,8 @@ jobs:
187187
runs-on: 'ubuntu-24.04'
188188
if: github.event_name == 'push'
189189
permissions:
190-
id-token: write # Required for OIDC
191-
contents: read # Required for checkout
190+
id-token: write # Required for OIDC
191+
contents: read # Required for checkout
192192
steps:
193193
- uses: 'actions/checkout@v4'
194194
with:
@@ -199,7 +199,7 @@ jobs:
199199
run: |
200200
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
201201
git checkout ${{ github.ref }}
202-
- uses: 'actions/setup-node@v4'
202+
- uses: 'actions/setup-node@v6'
203203
with:
204204
node-version: '22.12.0'
205205
- uses: 'actions/setup-python@v4'

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ on:
1818
- 'yarn.lock'
1919
- '.github/workflows/app-test-build-deploy.yaml'
2020
- '.github/workflows/utils.js'
21+
- 'vitest.config.*'
2122
branches:
2223
- '**'
2324
tags:
@@ -36,6 +37,7 @@ on:
3637
- '*.json'
3738
- 'yarn.lock'
3839
- 'scripts/**'
40+
- '.vitest.config.*'
3941
workflow_dispatch: {}
4042

4143
concurrency:
@@ -450,7 +452,7 @@ jobs:
450452
if: always() && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/tags/ot3')) && needs.js-unit-test.result == 'success' && needs.backend-unit-test.result == 'success' && needs.build-app.result == 'success' && needs.deploy-release-app.result == 'success'
451453
steps:
452454
- name: Checkout Repository
453-
uses: actions/checkout@v4
455+
uses: actions/checkout@v5
454456
- name: 'Send success alert'
455457
uses: ./.github/actions/simple-build-alert
456458
continue-on-error: true
@@ -473,7 +475,7 @@ jobs:
473475
if: always() && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/tags/ot3')) && (needs.js-unit-test.result == 'failure' || needs.backend-unit-test.result == 'failure' || needs.build-app.result == 'failure' || needs.deploy-release-app.result == 'failure')
474476
steps:
475477
- name: Checkout Repository
476-
uses: actions/checkout@v4
478+
uses: actions/checkout@v5
477479
- name: 'Determine failed jobs'
478480
id: failed-jobs
479481
shell: bash
@@ -518,7 +520,7 @@ jobs:
518520
if: always() && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/tags/ot3')) && (needs.js-unit-test.result == 'cancelled' || needs.backend-unit-test.result == 'cancelled' || needs.build-app.result == 'cancelled' || needs.deploy-release-app.result == 'cancelled')
519521
steps:
520522
- name: Checkout Repository
521-
uses: actions/checkout@v4
523+
uses: actions/checkout@v5
522524
- name: 'Send cancelled alert'
523525
uses: ./.github/actions/simple-build-alert
524526
continue-on-error: true

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

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
- 'app/src/molecules/**'
1515
- 'protocol-designer/src/components/**'
1616
- 'scripts/static-deploy/**'
17+
- 'vitest.config.*'
1718
push:
1819
branches:
1920
- 'edge'
@@ -46,7 +47,7 @@ jobs:
4647
relative_artifact_dir: ${{ steps.deploy-config.outputs.RELATIVE_ARTIFACT_DIR }}
4748
steps:
4849
- name: Checkout Repository
49-
uses: actions/checkout@v4
50+
uses: actions/checkout@v5
5051
- uses: ./.github/actions/git/resolve-tag
5152
- name: Setup UV
5253
uses: astral-sh/setup-uv@v6
@@ -90,11 +91,11 @@ jobs:
9091
name: 'components-artifact'
9192
path: storybook-static
9293

93-
9494
deploy-components:
9595
name: 'deploy components storybook artifact to S3'
9696
runs-on: 'ubuntu-24.04'
97-
needs: ['determine-deploy-config', 'js-unit-test', 'build-components-storybook']
97+
needs:
98+
['determine-deploy-config', 'js-unit-test', 'build-components-storybook']
9899
if: always() && needs.build-components-storybook.result == 'success' && needs.determine-deploy-config.result == 'success'
99100
permissions:
100101
id-token: write
@@ -106,7 +107,7 @@ jobs:
106107
role-to-assume: ${{ secrets.STATIC_DEPLOYMENT_ROLE }}
107108
aws-region: us-east-2
108109
- name: Checkout Repository
109-
uses: actions/checkout@v4
110+
uses: actions/checkout@v5
110111
with:
111112
fetch-depth: 0
112113
- id: resolve-tag
@@ -156,7 +157,7 @@ jobs:
156157
json -I -f ./components/package.json -e "this.version=\"$VERSION_STRING\""
157158
json -I -f ./components/package.json -e "this.dependencies['@opentrons/shared-data']=\"$VERSION_STRING\""
158159
json -I -f ./components/package.json -e "delete this.dependencies['@opentrons/step-generation']"
159-
- uses: 'actions/setup-node@v4'
160+
- uses: 'actions/setup-node@v6'
160161
with:
161162
node-version: '22.12.0'
162163
registry-url: 'https://registry.npmjs.org'
@@ -173,11 +174,17 @@ jobs:
173174
notify-success:
174175
name: 'Notify Build Success'
175176
runs-on: 'ubuntu-latest'
176-
needs: [js-unit-test, build-components-storybook, deploy-components, publish-components]
177+
needs:
178+
[
179+
js-unit-test,
180+
build-components-storybook,
181+
deploy-components,
182+
publish-components,
183+
]
177184
if: always() && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && needs.js-unit-test.result == 'success' && needs.build-components-storybook.result == 'success' && needs.deploy-components.result == 'success' && needs.publish-components.result == 'success'
178185
steps:
179186
- name: Checkout Repository
180-
uses: actions/checkout@v4
187+
uses: actions/checkout@v5
181188
- name: 'Send success alert'
182189
uses: ./.github/actions/simple-build-alert
183190
with:
@@ -188,11 +195,17 @@ jobs:
188195
notify-failure:
189196
name: 'Notify Build Failure'
190197
runs-on: 'ubuntu-latest'
191-
needs: [js-unit-test, build-components-storybook, deploy-components, publish-components]
198+
needs:
199+
[
200+
js-unit-test,
201+
build-components-storybook,
202+
deploy-components,
203+
publish-components,
204+
]
192205
if: always() && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && (needs.js-unit-test.result == 'failure' || needs.build-components-storybook.result == 'failure' || needs.deploy-components.result == 'failure' || needs.publish-components.result == 'failure')
193206
steps:
194207
- name: Checkout Repository
195-
uses: actions/checkout@v4
208+
uses: actions/checkout@v5
196209
- name: 'Determine failed jobs'
197210
id: failed-jobs
198211
shell: bash
@@ -210,7 +223,7 @@ jobs:
210223
if [[ "${{ needs.publish-components.result }}" == "failure" ]]; then
211224
failed_jobs+=("publish-components")
212225
fi
213-
226+
214227
IFS=','
215228
echo "failed_jobs=${failed_jobs[*]}" >> $GITHUB_OUTPUT
216229
@@ -225,11 +238,17 @@ jobs:
225238
notify-cancelled:
226239
name: 'Notify Build Cancelled'
227240
runs-on: 'ubuntu-latest'
228-
needs: [js-unit-test, build-components-storybook, deploy-components, publish-components]
241+
needs:
242+
[
243+
js-unit-test,
244+
build-components-storybook,
245+
deploy-components,
246+
publish-components,
247+
]
229248
if: always() && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && (needs.js-unit-test.result == 'cancelled' || needs.build-components-storybook.result == 'cancelled' || needs.deploy-components.result == 'cancelled' || needs.publish-components.result == 'cancelled')
230249
steps:
231250
- name: Checkout Repository
232-
uses: actions/checkout@v4
251+
uses: actions/checkout@v5
233252
- name: 'Send cancelled alert'
234253
uses: ./.github/actions/simple-build-alert
235254
with:

‎.github/workflows/docs-build-deploy.yaml‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ env:
2929
# to the working-directory of our tools: scripts/static-deploy
3030
# our script deploy_ci_config.py expects this ENV variable is set
3131
RELATIVE_ARTIFACT_DIR: '../../dist'
32-
32+
3333
jobs:
3434
build-docs:
3535
timeout-minutes: 5
@@ -43,7 +43,7 @@ jobs:
4343
artifacts-path: ${{ steps.upload-artifacts.outputs.path }}
4444
steps:
4545
- name: 'Checkout Repository'
46-
uses: actions/checkout@v4
46+
uses: actions/checkout@v5
4747
- name: Setup UV
4848
uses: astral-sh/setup-uv@v6
4949
with:
@@ -66,35 +66,35 @@ jobs:
6666
retention-days: 1
6767

6868
determine-deploy-config:
69-
name: Determine Deployment Configuration
70-
runs-on: ubuntu-24.04
71-
outputs:
72-
application: ${{ steps.deploy-config.outputs.APPLICATION }}
73-
environment: ${{ steps.deploy-config.outputs.ENVIRONMENT }}
74-
sandbox_prefix: ${{ steps.deploy-config.outputs.SANDBOX_PREFIX }}
75-
relative_artifact_dir: ${{ steps.deploy-config.outputs.RELATIVE_ARTIFACT_DIR }}
76-
branch: ${{ steps.config.outputs.branch }}
77-
bucket: ${{ steps.config.outputs.bucket }}
78-
url: ${{ steps.config.outputs.url }}
79-
steps:
80-
- name: Checkout Repository
81-
uses: actions/checkout@v4
82-
- uses: ./.github/actions/git/resolve-tag
83-
- name: Setup UV
84-
uses: astral-sh/setup-uv@v6
85-
with:
86-
python-version: '3.10'
87-
enable-cache: true
88-
- name: Setup Deploy Dependencies
89-
working-directory: scripts/static-deploy
90-
run: make setup
91-
- name: Determine Deployment Configuration
92-
id: deploy-config
93-
working-directory: scripts/static-deploy
94-
run: make resolve-ci
69+
name: Determine Deployment Configuration
70+
runs-on: ubuntu-24.04
71+
outputs:
72+
application: ${{ steps.deploy-config.outputs.APPLICATION }}
73+
environment: ${{ steps.deploy-config.outputs.ENVIRONMENT }}
74+
sandbox_prefix: ${{ steps.deploy-config.outputs.SANDBOX_PREFIX }}
75+
relative_artifact_dir: ${{ steps.deploy-config.outputs.RELATIVE_ARTIFACT_DIR }}
76+
branch: ${{ steps.config.outputs.branch }}
77+
bucket: ${{ steps.config.outputs.bucket }}
78+
url: ${{ steps.config.outputs.url }}
79+
steps:
80+
- name: Checkout Repository
81+
uses: actions/checkout@v5
82+
- uses: ./.github/actions/git/resolve-tag
83+
- name: Setup UV
84+
uses: astral-sh/setup-uv@v6
85+
with:
86+
python-version: '3.10'
87+
enable-cache: true
88+
- name: Setup Deploy Dependencies
89+
working-directory: scripts/static-deploy
90+
run: make setup
91+
- name: Determine Deployment Configuration
92+
id: deploy-config
93+
working-directory: scripts/static-deploy
94+
run: make resolve-ci
9595

9696
deploy-docs:
97-
needs:
97+
needs:
9898
- build-docs
9999
- determine-deploy-config
100100
timeout-minutes: 5
@@ -109,7 +109,7 @@ jobs:
109109
URL: ${{ needs.determine-deploy-config.outputs.url }}
110110
steps:
111111
- name: Checkout Repository
112-
uses: actions/checkout@v4
112+
uses: actions/checkout@v5
113113
- id: resolve-tag
114114
uses: ./.github/actions/git/resolve-tag
115115
- name: Setup UV
@@ -119,8 +119,7 @@ jobs:
119119
enable-cache: true
120120
- name: Setup Deploy Dependencies
121121
working-directory: scripts/static-deploy
122-
run:
123-
make setup
122+
run: make setup
124123
- name: Configure AWS Credentials
125124
uses: aws-actions/configure-aws-credentials@v4
126125
with:
@@ -141,8 +140,8 @@ jobs:
141140
ENVIRONMENT=${{ needs.determine-deploy-config.outputs.environment }} \
142141
SANDBOX_PREFIX=${{ needs.determine-deploy-config.outputs.sandbox_prefix }} \
143142
RELATIVE_ARTIFACT_DIR=${{ needs.determine-deploy-config.outputs.relative_artifact_dir }}
144-
143+
145144
- name: Output Deployment URL
146145
run: |
147146
echo "## 🚀 Docs site deployed to ${{ env.ENVIRONMENT }}" >> $GITHUB_STEP_SUMMARY
148-
echo "<${{ env.URL }}>" >> $GITHUB_STEP_SUMMARY
147+
echo "<${{ env.URL }}>" >> $GITHUB_STEP_SUMMARY

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
relative_artifact_dir: ${{ steps.deploy-config.outputs.RELATIVE_ARTIFACT_DIR }}
5757
steps:
5858
- name: Checkout Repository
59-
uses: actions/checkout@v4
59+
uses: actions/checkout@v5
6060
- uses: ./.github/actions/git/resolve-tag
6161
- name: Setup UV
6262
uses: astral-sh/setup-uv@v6
@@ -80,7 +80,7 @@ jobs:
8080
fetch-depth: 0
8181
- uses: ./.github/actions/git/resolve-tag
8282
- uses: ./.github/actions/environment/complex-variables
83-
- uses: 'actions/setup-node@v4'
83+
- uses: 'actions/setup-node@v6'
8484
with:
8585
node-version: '22.12.0'
8686
- uses: 'actions/setup-python@v3'
@@ -111,7 +111,7 @@ jobs:
111111
contents: read
112112
steps:
113113
- name: Checkout Repository
114-
uses: actions/checkout@v4
114+
uses: actions/checkout@v5
115115
with:
116116
fetch-depth: 0
117117
- uses: ./.github/actions/git/resolve-tag

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- uses: 'actions/checkout@v4'
4040
with:
4141
fetch-depth: 0
42-
- uses: 'actions/setup-node@v4'
42+
- uses: 'actions/setup-node@v6'
4343
with:
4444
node-version: '12'
4545
- uses: 'actions/setup-python@v3'

0 commit comments

Comments
 (0)