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(app,app-shell,app-shell-odd, protocol-designer, labware-library, components, labware-designer): update Electron version to v27.0.0 #14314

Merged
merged 46 commits into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from 44 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
b66513d
chore(app,app-shell,app-shell-odd): update Electron version to v23
koji Jan 10, 2024
103fa6d
update Nodejs version in CI files
koji Jan 10, 2024
3dc8fb1
add node_option to labware designer
koji Jan 10, 2024
2c9c929
update ui deprecated part and remove usb-detection
koji Jan 10, 2024
abf9638
updatet app-shell Makefile
koji Jan 10, 2024
feb5b55
Windows works
koji Jan 10, 2024
adc2103
use v27.0.0 instead of the end of life versions
koji Jan 11, 2024
287ea05
add node option to Makefile in components
koji Jan 12, 2024
ffe43bd
Merge branch 'edge' into chore_update-electron-v27.0.0
koji Jan 12, 2024
acd8450
fix odd mode and update electron-context-menu
koji Jan 12, 2024
fc16751
remove webcontent.on new-window
koji Jan 12, 2024
5e9c263
for building asar for ODD
koji Jan 12, 2024
2afbbfc
update node version to 20
koji Jan 12, 2024
0e39e58
Update Makefile
koji Jan 12, 2024
e6c6084
remove usb-detection related codes
koji Jan 16, 2024
3abacb1
update type for tests
koji Jan 17, 2024
309fe2c
update tests
koji Jan 17, 2024
e153d72
fix type issues
koji Jan 17, 2024
4f39838
fix test case to use usb package
koji Jan 17, 2024
c337c39
change ci's nodejs version to v21
koji Jan 17, 2024
1cd1349
Merge branch 'edge' into chore_update-electron-v27.0.0
koji Jan 17, 2024
160e404
Update dispatch.test.ts
koji Jan 17, 2024
b4e09e3
Update dispatch.test.ts
koji Jan 17, 2024
da601ca
remove export
koji Jan 17, 2024
2283016
fix type issues
koji Jan 17, 2024
15fc98c
fix secondary button test
koji Jan 17, 2024
e0a0584
chnage the way to access getDevices method
koji Jan 18, 2024
bda5358
fix test-js and check-js errors
koji Jan 19, 2024
c5c03f4
update Makefile to fix ci error on cypress
koji Jan 22, 2024
46e5c3d
Update Makefile
koji Jan 22, 2024
ea0c8ab
pass option separately due to cypress
koji Jan 22, 2024
f6c1c10
address feedback use nodejs v18.19.0
koji Jan 27, 2024
ed2ed1d
Merge branch 'edge' into chore_update-electron-v27.0.0
koji Jan 27, 2024
63e70ce
fix check-js errors
koji Jan 27, 2024
2f8abb2
fix test-js error
koji Jan 28, 2024
d6968d2
update Makefile for CI tests
koji Jan 29, 2024
38f7281
update for CI test
koji Jan 29, 2024
8a0f8df
Merge branch 'edge' into chore_update-electron-v27.0.0
koji Jan 30, 2024
1061ac7
Update yarn.lock
koji Jan 30, 2024
ed6dc06
change node version to 18.19.0
koji Jan 30, 2024
2a360ce
set ipv4first dns default result order
brenthagen Jan 30, 2024
06d230d
Merge branch 'edge' into chore_update-electron-v27.0.0
brenthagen Jan 30, 2024
e57d346
fix yaml lint
brenthagen Jan 30, 2024
bbe746a
fix: dev servers must serve on all protocols
sfoster1 Jan 31, 2024
f9ce2c5
get some timing info on cypress
sfoster1 Jan 31, 2024
d559db9
add v6 bindings to most all dev servers
sfoster1 Jan 31, 2024
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
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 @@ -56,7 +56,7 @@ jobs:
fetch-depth: 0
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.10'
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- uses: 'actions/setup-python@v4'
with:
python-version: ${{ matrix.python }}
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.10'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/app-test-build-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
- uses: 'actions/checkout@v3'
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- name: 'install udev'
run: sudo apt-get update && sudo apt-get install libudev-dev
- name: 'set complex environment variables'
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- uses: actions/setup-python@v4
with:
python-version: '3.10'
Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- uses: actions/setup-python@v4
with:
python-version: '3.10'
Expand Down Expand Up @@ -427,7 +427,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- name: 'install udev'
run: sudo apt-get update && sudo apt-get install libudev-dev
- name: 'set complex environment variables'
Expand Down
51 changes: 26 additions & 25 deletions .github/workflows/components-test-build-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- uses: 'actions/checkout@v3'
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- name: 'install udev for usb-detection'
run: sudo apt-get update && sudo apt-get install libudev-dev
- name: 'cache yarn cache'
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
- uses: 'actions/checkout@v3'
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- name: 'install udev for usb-detection'
run: sudo apt-get update && sudo apt-get install libudev-dev
- name: 'cache yarn cache'
Expand All @@ -104,29 +104,30 @@ jobs:
path: storybook-static

determine-build-type:
runs-on: 'ubuntu-latest'
name: 'Determine build type'
outputs:
type: ${{steps.determine-build-type.outputs.type}}
steps:
- id: determine-build-type
run: |
echo "Determining build type for event ${{github.event_type}} and ref ${{github.ref}}"
if [ "${{ format('{0}', github.ref == 'refs/heads/edge') }}" = "true" ] ; then
echo "storybook s3 builds for edge"
echo 'type=storybook' >> $GITHUB_OUTPUT
elif [ "${{ format('{0}', startsWith(github.ref, 'refs/tags/components')) }}" = "true" ] ; then
echo "publish builds for components tags"
echo 'type=publish' >> $GITHUB_OUTPUT
else
echo "No build for ref ${{github.ref}} and event ${{github.event_type}}"
echo 'type=none' >> $GITHUB_OUTPUT
fi
runs-on: 'ubuntu-latest'
name: 'Determine build type'
outputs:
type: ${{steps.determine-build-type.outputs.type}}
steps:
- id: determine-build-type
run: |
echo "Determining build type for event ${{github.event_type}} and ref ${{github.ref}}"
if [ "${{ format('{0}', github.ref == 'refs/heads/edge') }}" = "true" ] ; then
echo "storybook s3 builds for edge"
echo 'type=storybook' >> $GITHUB_OUTPUT
elif [ "${{ format('{0}', startsWith(github.ref, 'refs/tags/components')) }}" = "true" ] ; then
echo "publish builds for components tags"
echo 'type=publish' >> $GITHUB_OUTPUT
else
echo "No build for ref ${{github.ref}} and event ${{github.event_type}}"
echo 'type=none' >> $GITHUB_OUTPUT
fi

deploy-components:
name: 'deploy components storybook artifact to S3'
runs-on: 'ubuntu-22.04'
needs: ['js-unit-test', 'build-components-storybook', 'determine-build-type']
needs:
['js-unit-test', 'build-components-storybook', 'determine-build-type']
if: needs.determine-build-type.outputs.type != 'none'
steps:
- uses: 'actions/checkout@v3'
Expand All @@ -138,7 +139,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- name: 'set complex environment variables'
id: 'set-vars'
uses: actions/github-script@v6
Expand Down Expand Up @@ -174,7 +175,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
registry-url: 'https://registry.npmjs.org'
- name: 'cache yarn cache'
uses: actions/cache@v3
Expand Down Expand Up @@ -205,10 +206,10 @@ jobs:
json -I -f ./components/package.json -e "this.dependencies['@opentrons/shared-data']=\"$VERSION_STRING\""
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
registry-url: 'https://registry.npmjs.org'
- name: 'publish to npm registry'
env:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
run: |
cd ./components && echo "//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}" > ./.npmrc && npm publish --access public
2 changes: 1 addition & 1 deletion .github/workflows/docs-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- uses: 'actions/setup-python@v3'
with:
python-version: '3.10'
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 @@ -49,7 +49,7 @@ jobs:
run: sudo apt-get update && sudo apt-get install libudev-dev
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- 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.10'
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- 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 @@ -45,7 +45,7 @@ jobs:
- uses: 'actions/checkout@v3'
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- name: 'set complex environment variables'
id: 'set-vars'
uses: actions/github-script@v6
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ll-test-build-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- uses: 'actions/checkout@v3'
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
# https://github.com/actions/checkout/issues/290
- name: 'Fix actions/checkout odd handling of tags'
if: startsWith(github.ref, 'refs/tags')
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- name: 'install libudev for usb-detection'
run: sudo apt-get update && sudo apt-get install libudev-dev
- name: 'cache yarn cache'
Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- name: 'install libudev for usb-detection'
run: sudo apt-get update && sudo apt-get install libudev-dev
- name: 'cache yarn cache'
Expand Down Expand Up @@ -176,7 +176,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- name: 'install udev for usb-detection'
run: sudo apt-get update && sudo apt-get install libudev-dev
- name: 'set complex environment variables'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pd-test-build-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- name: 'install udev for usb-detection'
run: sudo apt-get update && sudo apt-get install libudev-dev
- name: 'cache yarn cache'
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- name: 'install udev for usb-detection'
if: startsWith(matrix.os, 'ubuntu')
run: sudo apt-get update && sudo apt-get install libudev-dev
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- name: 'install udev for usb-detection'
run: sudo apt-get update && sudo apt-get install libudev-dev
- name: 'cache yarn cache'
Expand Down Expand Up @@ -178,7 +178,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- name: 'install udev for usb-detection'
run: sudo apt-get update && sudo apt-get install libudev-dev
- name: 'set complex environment variables'
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 @@ -39,7 +39,7 @@ jobs:
- uses: 'actions/checkout@v3'
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- name: 'install libudev for usb-detection'
run: sudo apt-get update && sudo apt-get install libudev-dev
- name: 'cache yarn cache'
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@v3'
with:
node-version: '16'
node-version: '18.19.0'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.10'
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@v3'
with:
node-version: '16'
node-version: '18.19.0'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.10'
Expand All @@ -67,7 +67,7 @@ jobs:
fetch-depth: 0
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '18.19.0'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.10'
Expand Down
Loading
Loading