Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(monorepo): Update Electron to v33.2.1 #17010

Merged
merged 11 commits into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from 9 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
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
**/CHANGELOG.md
!api/release-notes.md
!app-shell/build/release-notes.md
**/.yarn-cache/**

# components library
storybook-static
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/abr-testing-lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ jobs:
runs-on: 'windows-latest'
steps:
- name: Checkout opentrons repo
uses: 'actions/checkout@v3'
uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- name: Setup Node
uses: 'actions/setup-node@v3'
uses: 'actions/setup-node@v4'
with:
node-version: '12'
- name: Setup Python
Expand All @@ -52,8 +52,6 @@ jobs:
with:
project: 'abr-testing'
- name: lint
run:
make -C abr-testing lint
run: make -C abr-testing lint
- name: test
run:
make -C abr-testing test
run: make -C abr-testing test
18 changes: 9 additions & 9 deletions .github/workflows/api-test-lint-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ jobs:
timeout-minutes: 10
runs-on: 'ubuntu-22.04'
steps:
- uses: 'actions/checkout@v3'
- uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- uses: 'actions/setup-node@v3'
- uses: 'actions/setup-node@v4'
with:
node-version: '18.19.0'
node-version: '22.11.0'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.10'
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
with-ot-hardware: 'true'
runs-on: '${{ matrix.os }}'
steps:
- uses: 'actions/checkout@v3'
- uses: 'actions/checkout@v4'
with:
fetch-depth: 0
# https://github.com/actions/checkout/issues/290
Expand All @@ -93,9 +93,9 @@ jobs:
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
- uses: 'actions/setup-node@v4'
with:
node-version: '18.19.0'
node-version: '22.11.0'
- uses: 'actions/setup-python@v4'
with:
python-version: ${{ matrix.python }}
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
runs-on: 'ubuntu-22.04'
if: github.event_name == 'push'
steps:
- uses: 'actions/checkout@v3'
- uses: 'actions/checkout@v4'
with:
fetch-depth: 0
# https://github.com/actions/checkout/issues/290
Expand All @@ -143,9 +143,9 @@ jobs:
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
- uses: 'actions/setup-node@v4'
with:
node-version: '18.19.0'
node-version: '22.11.0'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.10'
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/app-test-build-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ jobs:
name: 'opentrons app frontend unit tests'
timeout-minutes: 60
steps:
- uses: 'actions/checkout@v3'
- uses: 'actions/setup-node@v3'
- uses: 'actions/checkout@v4'
- uses: 'actions/setup-node@v4'
with:
node-version: '18.19.0'
node-version: '22.11.0'
- 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 @@ -105,7 +105,7 @@ jobs:
timeout-minutes: 60
runs-on: ${{ matrix.os }}
steps:
- uses: 'actions/checkout@v3'
- uses: 'actions/checkout@v4'
with:
fetch-depth: 0
# https://github.com/actions/checkout/issues/290
Expand All @@ -114,9 +114,9 @@ jobs:
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
- uses: 'actions/setup-node@v4'
with:
node-version: '18.19.0'
node-version: '22.11.0'
- uses: actions/setup-python@v4
with:
python-version: '3.10'
Expand Down Expand Up @@ -261,7 +261,7 @@ jobs:
echo "bucket=${{env._APP_DEPLOY_BUCKET_OT3}}" >> $GITHUB_OUTPUT
echo "folder=${{env._APP_DEPLOY_FOLDER_OT3}}" >> $GITHUB_OUTPUT
fi
- uses: 'actions/checkout@v3'
- uses: 'actions/checkout@v4'
with:
fetch-depth: 0
# https://github.com/actions/checkout/issues/290
Expand All @@ -270,9 +270,9 @@ jobs:
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
- uses: 'actions/setup-node@v4'
with:
node-version: '18.19.0'
node-version: '22.11.0'
- uses: actions/setup-python@v4
with:
python-version: '3.10'
Expand Down Expand Up @@ -488,7 +488,7 @@ jobs:
_ACCESS_URL: https://${{env._APP_DEPLOY_BUCKET_ROBOTSTACK}}/${{env._APP_DEPLOY_FOLDER_ROBOTSTACK}}

- name: 'pull repo for scripts'
uses: 'actions/checkout@v3'
uses: 'actions/checkout@v4'
with:
path: ./monorepo
# https://github.com/actions/checkout/issues/290
Expand All @@ -498,9 +498,9 @@ jobs:
cd ./monorepo
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
- uses: 'actions/setup-node@v4'
with:
node-version: '18.19.0'
node-version: '22.11.0'
- 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
28 changes: 14 additions & 14 deletions .github/workflows/components-test-build-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ jobs:
timeout-minutes: 30
runs-on: 'ubuntu-22.04'
steps:
- uses: 'actions/checkout@v3'
- uses: 'actions/setup-node@v3'
- uses: 'actions/checkout@v4'
- uses: 'actions/setup-node@v4'
with:
node-version: '18.19.0'
node-version: '22.11.0'
- 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 @@ -79,10 +79,10 @@ jobs:
if: github.event_name != 'pull_request'
needs: ['js-unit-test']
steps:
- uses: 'actions/checkout@v3'
- uses: 'actions/setup-node@v3'
- uses: 'actions/checkout@v4'
- uses: 'actions/setup-node@v4'
with:
node-version: '18.19.0'
node-version: '22.11.0'
- 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 @@ -140,16 +140,16 @@ jobs:
['js-unit-test', 'build-components-storybook', 'determine-build-type']
if: needs.determine-build-type.outputs.type != 'none'
steps:
- uses: 'actions/checkout@v3'
- uses: 'actions/checkout@v4'
# https://github.com/actions/checkout/issues/290
- name: 'Fix actions/checkout odd handling of tags'
if: startsWith(github.ref, 'refs/tags')
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
- uses: 'actions/setup-node@v4'
with:
node-version: '18.19.0'
node-version: '22.11.0'
- name: 'set complex environment variables'
id: 'set-vars'
uses: actions/github-script@v6
Expand Down Expand Up @@ -180,16 +180,16 @@ jobs:
needs: ['js-unit-test', 'determine-build-type']
if: needs.determine-build-type.outputs.type == 'publish'
steps:
- uses: 'actions/checkout@v3'
- uses: 'actions/checkout@v4'
# https://github.com/actions/checkout/issues/290
- name: 'Fix actions/checkout odd handling of tags'
if: startsWith(github.ref, 'refs/tags')
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
- uses: 'actions/setup-node@v4'
with:
node-version: '18.19.0'
node-version: '22.11.0'
registry-url: 'https://registry.npmjs.org'
- name: 'install udev for usb-detection'
run: |
Expand All @@ -213,9 +213,9 @@ jobs:
VERSION_STRING=$(echo ${{ github.ref }} | sed 's/refs\/tags\/components@//')
json -I -f ./components/package.json -e "this.version=\"$VERSION_STRING\""
json -I -f ./components/package.json -e "this.dependencies['@opentrons/shared-data']=\"$VERSION_STRING\""
- uses: 'actions/setup-node@v3'
- uses: 'actions/setup-node@v4'
with:
node-version: '18.19.0'
node-version: '22.11.0'
registry-url: 'https://registry.npmjs.org'
- name: 'publish to npm registry'
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docs-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
name: opentrons documentation build
runs-on: 'ubuntu-22.04'
steps:
- uses: 'actions/checkout@v3'
- uses: 'actions/checkout@v4'
with:
fetch-depth: 0
# https://github.com/actions/checkout/issues/290
Expand All @@ -49,9 +49,9 @@ jobs:
run: |
git fetch -f origin ${{ github.ref }}:${{ github.ref }}
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
- uses: 'actions/setup-node@v4'
with:
node-version: '18.19.0'
node-version: '22.11.0'
- uses: 'actions/setup-python@v3'
with:
python-version: '3.10'
Expand Down
16 changes: 5 additions & 11 deletions .github/workflows/g-code-confirm-tests.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "G-Code-Confirm"
name: 'G-Code-Confirm'

on:
# Run on any change to the api directory
Expand Down Expand Up @@ -31,20 +31,14 @@ jobs:
confirm-g-code:
strategy:
matrix:
command: [
'2-modules',
'swift-smoke',
'swift-turbo',
'omega',
'fast'
]
command: ['2-modules', 'swift-smoke', 'swift-turbo', 'omega', 'fast']
name: 'Confirm G-Code (${{ matrix.command }})'
runs-on: 'ubuntu-22.04'
steps:
- uses: 'actions/checkout@v3'
- uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- uses: 'actions/setup-node@v3'
- uses: 'actions/setup-node@v4'
with:
node-version: '12'
- uses: 'actions/setup-python@v3'
Expand All @@ -54,7 +48,7 @@ jobs:
with:
project: 'g-code-testing'

- name: "Verify no missing comparison files"
- name: 'Verify no missing comparison files'
run: make -C g-code-testing check-for-missing-comparison-files

- name: 'Run & Compare to comparison files'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/g-code-testing-lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@ jobs:
name: 'g-code-testing package linting and tests'
runs-on: 'ubuntu-22.04'
steps:
- uses: 'actions/checkout@v3'
- uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- 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
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
sudo apt-get update && sudo apt-get install libudev-dev
- uses: 'actions/setup-node@v3'
- uses: 'actions/setup-node@v4'
with:
node-version: '18.19.0'
node-version: '22.11.0'
- name: 'set complex environment variables'
id: 'set-vars'
uses: actions/github-script@v6
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/hardware-lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ jobs:
runs-on: 'ubuntu-20.04'
steps:
- name: Checkout opentrons repo
uses: 'actions/checkout@v3'
uses: 'actions/checkout@v4'
with:
fetch-depth: 0
- name: Setup Node
uses: 'actions/setup-node@v3'
uses: 'actions/setup-node@v4'
with:
node-version: '12'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/hardware-testing-protocols.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ jobs:
runs-on: 'ubuntu-20.04'
steps:
- name: Checkout opentrons repo
uses: 'actions/checkout@v3'
uses: 'actions/checkout@v4'
with:
fetch-depth: 0

- name: Setup Node
uses: 'actions/setup-node@v3'
uses: 'actions/setup-node@v4'
with:
node-version: '12'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/hardware-testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ jobs:
runs-on: 'ubuntu-20.04'
steps:
- name: Checkout opentrons repo
uses: 'actions/checkout@v3'
uses: 'actions/checkout@v4'
with:
fetch-depth: 0

- name: Setup Node
uses: 'actions/setup-node@v3'
uses: 'actions/setup-node@v4'
with:
node-version: '12'

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/http-docs-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
name: HTTP API reference build
runs-on: 'ubuntu-22.04'
steps:
- uses: 'actions/checkout@v3'
- uses: 'actions/checkout@v4'
with:
fetch-depth: 0
# https://github.com/actions/checkout/issues/290
Expand All @@ -52,9 +52,9 @@ jobs:
- uses: 'actions/setup-python@v3'
with:
python-version: '3.10'
- uses: 'actions/setup-node@v3'
- uses: 'actions/setup-node@v4'
with:
node-version: '18.19.0'
node-version: '22.11.0'
- uses: './.github/actions/python/setup'
with:
project: 'robot-server'
Expand Down
Loading
Loading