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): update electron version from 21 to 27 #13602

Closed
wants to merge 46 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
c614ead
chore(app, app-shell): update electron version from 21 to 26
koji Sep 20, 2023
a04fb8a
Merge branch 'edge' into chore-electron-update-v26
koji Sep 24, 2023
09fe8ed
fix check-js issues
koji Sep 24, 2023
ece58eb
switch back from 18 to 16
koji Sep 24, 2023
fb38584
change node16 to node18
koji Sep 24, 2023
8783057
Update electron-builder.config.js
koji Oct 6, 2023
ab3c5b3
Update electron-builder.config.js
koji Oct 6, 2023
73e06d9
Update package.json
koji Oct 6, 2023
95070ce
Update Makefile
koji Oct 6, 2023
ec8c129
Merge branch 'edge' into chore-electron-update-v26
koji Oct 6, 2023
39b3d96
back to nodejs version to 16
koji Oct 6, 2023
2085809
update yarn.lock file
koji Oct 21, 2023
9a5e858
Merge branch 'edge' into chore-electron-update-v26
koji Oct 21, 2023
b9dfb9a
switch back the electron version
koji Oct 21, 2023
f33271f
add NODE_OPTIONS for openssl
koji Oct 23, 2023
390af5c
update node-version to 18
koji Oct 23, 2023
d7448af
export node options at top of each makefile that requires webpack
shlokamin Oct 23, 2023
ce11535
Merge branch 'edge' into chore-electron-update-v26
koji Oct 25, 2023
a218162
Merge branch 'edge' into chore-electron-update-v26
koji Nov 16, 2023
261644c
update electron version to the latest
koji Nov 29, 2023
f1cd09b
Merge branch 'edge' into chore-electron-update-v26
koji Nov 29, 2023
13a841d
update the node version of CIs
koji Nov 29, 2023
dcd6242
change sensors address to 01 (#14074)
ryanthecoder Dec 4, 2023
3ef9cb5
refactor(protocol-designer): adapter support for dropdown and update …
jerader Dec 5, 2023
3c4008d
ci(shared-data, components): add github action for publishing package…
b-cooper Dec 5, 2023
a8a370e
docs(api): refactor docstrings for labware.py (#14086)
jwwojak Dec 6, 2023
2a911e3
feat(step-generation, protocol-designer): 96-channel column partial t…
jerader Dec 6, 2023
6b83ab9
feat(protocol-designer): add biorad pcr plate as compatible with H-S …
jerader Dec 6, 2023
42194c6
feat(protocol-designer): off-deck button ff (#14061)
jerader Dec 6, 2023
01aa62b
ci(shared-data): only publish on version tags (#14113)
b-cooper Dec 6, 2023
47b2ba5
Merge branch 'chore_merge_7.1.alpha.2_into_edge' into edge
jerader Dec 7, 2023
9b22225
refactor(step-generation): fix merge back error in replaceTip (#14129)
jerader Dec 7, 2023
31c6d02
feat(protocol-designer): remove 96-channel ff and add cypress migrati…
jerader Dec 7, 2023
1ce77e5
feat(protocol-designer): remove deck config ff and add deck config cy…
jerader Dec 7, 2023
e6f7a59
feat(protocol-designer): update the defaulted flowrates for blowout (…
jerader Dec 7, 2023
4c26c6a
feat(api): raise an error when the gripper pickup fails (#14130)
caila-marashaj Dec 8, 2023
8a9330c
refactor(step-generation): update nozzles in robotState not from init…
jerader Dec 8, 2023
918284a
fix(protocol-designer): loadLabware support for off-deck labware (#14…
jerader Dec 12, 2023
a32571e
refactor(protocol-designer): misc staging area slot bugs addressing (…
jerader Dec 12, 2023
85dfebe
refactor(api): add explicit Flex hardware protocol (#14091)
fsinapi Dec 12, 2023
cf8876f
refactor(protocol-designer, step-generation): allow aluminum blocks t…
jerader Dec 12, 2023
5c952b7
fix(protocol-designer): TC renders for OT-2 and fix isSlotEmpty logic…
jerader Dec 13, 2023
d15b22e
fix(protocol-designer): getIsSlotEmpty logic util fix for modules and…
jerader Dec 14, 2023
53207fe
update typescript to the latest
koji Dec 14, 2023
3e9b973
Merge branch 'edge' into chore-electron-update-v26
koji Dec 14, 2023
ff0bd88
hold update typescript
koji Dec 14, 2023
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: '21'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '21'
- uses: 'actions/setup-python@v4'
with:
python-version: ${{ matrix.python }}
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '21'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
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: '21'
- 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: '21'
- 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: '21'
- 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: '21'
- name: 'install udev'
run: sudo apt-get update && sudo apt-get install libudev-dev
- name: 'set complex environment variables'
Expand Down
90 changes: 83 additions & 7 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: '21'
- name: 'install udev for usb-detection'
run: sudo apt-get update && sudo apt-get install libudev-dev
- name: 'cache yarn cache'
Expand All @@ -69,7 +69,7 @@ jobs:
files: ./coverage/lcov.info
flags: components

build-components:
build-components-storybook:
name: 'build components artifact'
runs-on: 'ubuntu-22.04'
if: github.event_name != 'pull_request'
Expand All @@ -78,7 +78,7 @@ jobs:
- uses: 'actions/checkout@v3'
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '21'
- name: 'install udev for usb-detection'
run: sudo apt-get update && sudo apt-get install libudev-dev
- name: 'cache yarn cache'
Expand All @@ -102,11 +102,32 @@ jobs:
with:
name: 'components-artifact'
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

deploy-components:
name: 'deploy components artifact to S3'
name: 'deploy components storybook artifact to S3'
runs-on: 'ubuntu-22.04'
needs: ['js-unit-test', 'build-components']
if: github.event_name != 'pull_request'
needs: ['js-unit-test', 'build-components-storybook', 'determine-build-type']
if: needs.determine-build-type.outputs.type != 'none'
steps:
- uses: 'actions/checkout@v3'
# https://github.com/actions/checkout/issues/290
Expand All @@ -117,7 +138,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '21'
- name: 'set complex environment variables'
id: 'set-vars'
uses: actions/github-script@v6
Expand All @@ -137,3 +158,58 @@ jobs:
AWS_DEFAULT_REGION: us-east-2
run: |
aws s3 sync ./dist s3://opentrons-components/${{ env.OT_BRANCH}} --acl public-read

publish-components:
name: 'publish components package to npm'
runs-on: 'ubuntu-latest'
needs: ['js-unit-test', 'determine-build-type']
if: needs.determine-build-type.outputs.type == 'publish'
steps:
- uses: 'actions/checkout@v3'
# 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'
with:
node-version: '16'
registry-url: 'https://registry.npmjs.org'
- name: 'cache yarn cache'
uses: actions/cache@v3
with:
path: |
${{ github.workspace }}/.yarn-cache
${{ github.workspace }}/.npm-cache
key: js-${{ secrets.GH_CACHE_VERSION }}-${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
restore-keys: |
js-${{ secrets.GH_CACHE_VERSION }}-${{ runner.os }}-yarn-
- name: 'setup-js'
run: |
npm config set cache ./.npm-cache
yarn config set cache-folder ./.yarn-cache
yarn config set network-timeout 60000
yarn
- name: 'build library'
run: |
make -C components lib
# replace package.json stub version number with version from tag
- name: 'set version number'
run: |
npm install -g json
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'
with:
node-version: '16'
registry-url: 'https://registry.npmjs.org'
- name: 'publish to npm registry'
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: '21'
- uses: 'actions/setup-python@v3'
with:
python-version: '3.7'
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: '21'
- 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.7'
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '21'
- 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: '21'
- 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 @@ -45,7 +45,7 @@ jobs:
- uses: 'actions/checkout@v3'
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '21'
# 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 @@ -91,7 +91,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '21'
- 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 @@ -131,7 +131,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '21'
- 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 @@ -174,7 +174,7 @@ jobs:
git checkout ${{ github.ref }}
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '21'
- 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/notify-server-lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
fetch-depth: 0
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '21'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
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: '21'
- 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: '21'
- 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: '21'
- 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: '21'
- 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: '21'
- 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 @@ -63,7 +63,7 @@ jobs:
fetch-depth: 0
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '21'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
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: '21'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
Expand All @@ -67,7 +67,7 @@ jobs:
fetch-depth: 0
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
node-version: '21'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.7'
Expand Down
Loading
Loading