-
Notifications
You must be signed in to change notification settings - Fork 179
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore(app-shell): Upgrade the Electron version to 21 (#11537)
This upgrade is for the ODD app. With Electron version 21, the ODD app works as expected (as well as the current app version). However, there are a couple of issues with this upgrade.
- Loading branch information
Showing
25 changed files
with
1,107 additions
and
660 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -52,12 +52,12 @@ jobs: | |
# to run cross-platform | ||
runs-on: 'ubuntu-22.04' | ||
name: 'opentrons app frontend unit tests' | ||
timeout-minutes: 30 | ||
timeout-minutes: 60 | ||
steps: | ||
- uses: 'actions/checkout@v3' | ||
- uses: 'actions/setup-node@v3' | ||
with: | ||
node-version: '14' | ||
node-version: '16' | ||
- name: 'install udev' | ||
run: sudo apt-get update && sudo apt-get install libudev-dev | ||
- name: 'set complex environment variables' | ||
|
@@ -93,21 +93,25 @@ jobs: | |
# to run cross-platform just like builds, might as well do them in the same job | ||
strategy: | ||
matrix: | ||
os: ['windows-2019', 'ubuntu-22.04', 'macos-latest'] | ||
os: ['windows-2022', 'ubuntu-22.04', 'macos-latest'] | ||
name: 'opentrons app backend unit tests and build' | ||
needs: ['js-unit-test'] | ||
runs-on: ${{ matrix.os }} | ||
steps: | ||
- uses: 'actions/checkout@v3' | ||
- uses: 'actions/setup-node@v3' | ||
with: | ||
node-version: '14' | ||
node-version: '16' | ||
- uses: actions/setup-python@v4 | ||
with: | ||
python-version: '3.10' | ||
- name: 'downgrade npm version' | ||
run: npm install -g npm@6 | ||
- name: check make version | ||
run: make --version | ||
- name: 'install libudev' | ||
if: startsWith(matrix.os, 'ubuntu') | ||
run: sudo apt-get update && sudo apt-get install libudev-dev | ||
run: sudo apt-get update && sudo apt-get upgrade && sudo apt-get install libudev-dev | ||
- name: 'set complex environment variables' | ||
id: 'set-vars' | ||
uses: actions/[email protected] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,7 +42,7 @@ jobs: | |
- uses: 'actions/checkout@v3' | ||
- uses: 'actions/setup-node@v3' | ||
with: | ||
node-version: '14' | ||
node-version: '16' | ||
- name: 'install udev for usb-detection' | ||
run: sudo apt-get update && sudo apt-get install libudev-dev | ||
- name: 'cache yarn cache' | ||
|
@@ -77,7 +77,7 @@ jobs: | |
- uses: 'actions/checkout@v3' | ||
- uses: 'actions/setup-node@v3' | ||
with: | ||
node-version: '14' | ||
node-version: '16' | ||
- name: 'install udev for usb-detection' | ||
run: sudo apt-get update && sudo apt-get install libudev-dev | ||
- name: 'cache yarn cache' | ||
|
@@ -110,7 +110,7 @@ jobs: | |
- uses: 'actions/checkout@v3' | ||
- uses: 'actions/setup-node@v3' | ||
with: | ||
node-version: '14' | ||
node-version: '16' | ||
- name: 'set complex environment variables' | ||
id: 'set-vars' | ||
uses: actions/[email protected] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -45,7 +45,7 @@ jobs: | |
- uses: 'actions/checkout@v3' | ||
- uses: 'actions/setup-node@v3' | ||
with: | ||
node-version: '14' | ||
node-version: '16' | ||
- name: 'set complex environment variables' | ||
id: 'set-vars' | ||
uses: actions/[email protected] | ||
|
@@ -70,7 +70,7 @@ jobs: | |
npm config set cache ${{ github.workspace }}/.npm-cache | ||
yarn config set cache-folder ${{ github.workspace }}/.yarn-cache | ||
make setup-js | ||
# Use the if to run all the lint checks even of some fail | ||
# Use the if to run all the lint checks even of some fail | ||
shell: bash | ||
- name: 'lint js' | ||
if: always() && steps.setup-js.outcome == 'success' | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
14 | ||
16 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.