Skip to content
Draft
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
2 changes: 1 addition & 1 deletion .github/actions/js/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ runs:
- name: 'Setup Node'
uses: actions/setup-node@v4
with:
node-version: '22.12.0'
node-version: '22.21.1'
cache: 'yarn'

- name: 'Setup Python'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/api-test-lint-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
fetch-depth: 0
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.12'
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- uses: 'actions/setup-python@v4'
with:
python-version: ${{ matrix.python }}
Expand Down Expand Up @@ -207,7 +207,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.12'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/components-test-build-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ jobs:
json -I -f ./components/package.json -e "delete this.dependencies['@opentrons/step-generation']"
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
registry-url: 'https://registry.npmjs.org'
- name: 'publish to npm registry'
env:
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 @@ -82,7 +82,7 @@ jobs:
- uses: ./.github/actions/environment/complex-variables
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- uses: 'actions/setup-python@v3'
with:
python-version: '3.12'
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 @@ -52,7 +52,7 @@ jobs:
sudo apt-get update && sudo apt-get install libudev-dev
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- name: 'set complex environment variables'
id: 'set-vars'
uses: actions/github-script@v6
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 @@ -54,7 +54,7 @@ jobs:
python-version: '3.12'
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- uses: './.github/actions/python/setup'
with:
project: 'robot-server'
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 @@ -51,7 +51,7 @@ jobs:
- uses: 'actions/checkout@v4'
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- name: 'set complex environment variables'
id: 'set-vars'
uses: actions/github-script@v6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- uses: 'actions/checkout@v4'
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- name: 'install udev'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
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 @@ -44,7 +44,7 @@ jobs:
- uses: 'actions/checkout@v4'
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- name: 'install udev'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/opentrons-ai-production-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: 'actions/checkout@v4'
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- name: 'install udev'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/react-api-client-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- uses: 'actions/checkout@v4'
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- name: 'install libudev for usb-detection'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/robot-server-lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
fetch-depth: 0
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.12'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/server-utils-lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
fetch-depth: 0
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.12'
Expand All @@ -67,7 +67,7 @@ jobs:
fetch-depth: 0
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.12'
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/shared-data-test-lint-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
fetch-depth: 0
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- uses: 'actions/setup-python@v3'
with:
python-version: '3.12'
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
sudo apt-get update && sudo apt-get install libudev-dev
- uses: 'actions/setup-node@v1'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- uses: 'actions/setup-python@v4'
with:
python-version: ${{ matrix.python }}
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
- uses: 'actions/checkout@v4'
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- name: 'install udev'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- name: 'install udev for usb-detection'
run: |
# WORKAROUND: Remove microsoft debian repo due to https://github.com/microsoft/linux-package-repositories/issues/130. Remove line below after it is resolved
Expand Down Expand Up @@ -238,7 +238,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
registry-url: 'https://registry.npmjs.org'
- name: 'install udev for usb-detection'
run: |
Expand Down Expand Up @@ -273,7 +273,7 @@ jobs:
cd ./shared-data
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
registry-url: 'https://registry.npmjs.org'
- name: 'publish to npm registry'
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/system-server-lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
fetch-depth: 0
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.12'
Expand All @@ -69,7 +69,7 @@ jobs:
fetch-depth: 0
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.12'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag-releases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
fetch-depth: 0
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- name: 'cache yarn cache'
uses: actions/cache@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-server-lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
fetch-depth: 0
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.12'
Expand All @@ -67,7 +67,7 @@ jobs:
fetch-depth: 0
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.12'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/usb-bridge-lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
fetch-depth: 0
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.12'
Expand All @@ -67,7 +67,7 @@ jobs:
fetch-depth: 0
- uses: 'actions/setup-node@v6'
with:
node-version: '22.12.0'
node-version: '22.21.1'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.12'
Expand Down
2 changes: 1 addition & 1 deletion app-shell-odd/electron-builder.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module.exports = {
appId: 'com.opentrons.odd',
electronVersion: '33.2.1',
electronVersion: '39.1.2',
npmRebuild: false,
files: [
'**/*',
Expand Down
2 changes: 1 addition & 1 deletion app-shell/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ no_python_bundle ?=

builder := yarn electron-builder \
--config electron-builder.config.js \
--config.electronVersion=33.2.1 \
--config.electronVersion=39.1.2 \
--publish never


Expand Down
2 changes: 1 addition & 1 deletion app-shell/electron-builder.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const publishConfig =
module.exports = async () => ({
appId:
project === 'robot-stack' ? 'com.opentrons.app' : 'com.opentrons.appot3',
electronVersion: '33.2.1',
electronVersion: '39.1.2',
npmRebuild: false,
releaseInfo: {
releaseNotesFile:
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"packageManager": "yarn@1.22.19",
"engines": {
"node": ">=22.12.0"
"node": ">=22.21.1"
},
"resolutions": {
"@storybook/react-docgen-typescript-plugin": "1.0.6--canary.9.cd77847.0"
Expand Down Expand Up @@ -80,7 +80,7 @@
"cz-conventional-changelog": "2.1.0",
"decompress": "4.2.1",
"download": "8.0.0",
"electron": "33.2.1",
"electron": "39.1.2",
"electron-builder": "26.0.15",
"eslint": "^8.56.0",
"eslint-config-prettier": "^8.1.0",
Expand Down
24 changes: 18 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6321,13 +6321,20 @@
dependencies:
undici-types "~5.26.4"

"@types/node@^20.17.9", "@types/node@^20.9.0":
"@types/node@^20.17.9":
version "20.17.9"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.17.9.tgz#5f141d4b7ee125cdee5faefe28de095398865bab"
integrity sha512-0JOXkRyLanfGPE2QRCwgxhzlBAvaRdCNMcvbd7jFfpmD4eEXll7LRwy5ymJmyeZqk7Nh7eD2LeUyQ68BbndmXw==
dependencies:
undici-types "~6.19.2"

"@types/node@^22.7.7":
version "22.19.0"
resolved "https://registry.yarnpkg.com/@types/node/-/node-22.19.0.tgz#849606ef3920850583a4e7ee0930987c35ad80be"
integrity sha512-xpr/lmLPQEj+TUnHmR+Ab91/glhJvsqcjB+yY0Ix9GO70H6Lb4FHH5GeqdOE5btAx7eIMwuHkp4H2MSkLcqWbA==
dependencies:
undici-types "~6.21.0"

"@types/normalize-package-data@^2.4.0":
version "2.4.4"
resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901"
Expand Down Expand Up @@ -10979,13 +10986,13 @@ electron-updater@6.3.9:
semver "^7.6.3"
tiny-typed-emitter "^2.1.0"

electron@33.2.1:
version "33.2.1"
resolved "https://registry.yarnpkg.com/electron/-/electron-33.2.1.tgz#d0d7bba7a7abf4f14881d0a6e03c498b301a2d5f"
integrity sha512-SG/nmSsK9Qg1p6wAW+ZfqU+AV8cmXMTIklUL18NnOKfZLlum4ZsDoVdmmmlL39ZmeCaq27dr7CgslRPahfoVJg==
electron@39.1.2:
version "39.1.2"
resolved "https://registry.yarnpkg.com/electron/-/electron-39.1.2.tgz#8871c24c6795aeae8eefc08a9800a4bd0f04093c"
integrity sha512-+/TwT9NWxyQGTm5WemJEJy+bWCpnKJ4PLPswI1yn1P63bzM0/8yAeG05yS+NfFaWH4yNQtGXZmAv87Bxa5RlLg==
dependencies:
"@electron/get" "^2.0.0"
"@types/node" "^20.9.0"
"@types/node" "^22.7.7"
extract-zip "^2.0.1"

elliptic@^6.5.3, elliptic@^6.5.5:
Expand Down Expand Up @@ -22185,6 +22192,11 @@ undici-types@~6.19.2:
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==

undici-types@~6.21.0:
version "6.21.0"
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb"
integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==

unicode-canonical-property-names-ecmascript@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
Expand Down
Loading