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.

Sign up for GitHub

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

Jump to bottom

chore(app-shell-odd): update electron builder config #14600

Merged
merged 10 commits into from
Mar 19, 2024
Merged

chore(app-shell-odd): update electron builder config #14600

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b2b07d6
chore(app-shell-odd): update electron version info in build config file
koji Mar 5, 2024
ce38dfb
add app.getVersion to retrieve electron version
koji Mar 5, 2024
ed2bd00
address comments
koji Mar 5, 2024
b190dfb
chore(app-shell-odd): update electron version info in build config file
koji Mar 5, 2024
4fc07ec
add app.getVersion to retrieve electron version
koji Mar 5, 2024
840bed6
address comments
koji Mar 5, 2024
04e42f8
remove pkg
koji Mar 8, 2024
4a86047
pass the electron version directly
koji Mar 8, 2024
7228a25
show mainwindow after first browser dispatch
sfoster1 Mar 18, 2024
341beec
add some todos
sfoster1 Mar 18, 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
3 changes: 2 additions & 1 deletion app-shell-odd/electron-builder.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
'use strict'
const { app } = require('electron')

module.exports = {
appId: 'com.opentrons.odd',
electronVersion: '23.3.13',
electronVersion: app.getVersion(),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i dont think this is quite right: this will get the version of the app, not electron: https://www.electronjs.org/docs/latest/api/app#appgetversion

i think we want to import our package.json directly:

import pkg from './package.json'

module.exports = {
...
  electronVersion: JSON.stringify(pkg.devDependencies.electron),
}

npmRebuild: false,
files: [
'**/*',
Expand Down
3 changes: 2 additions & 1 deletion app-shell/electron-builder.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict'
const path = require('path')
const { versionForProject } = require('../scripts/git-version')
const { app } = require('electron')

const {
OT_APP_DEPLOY_BUCKET,
Expand All @@ -25,7 +26,7 @@ const publishConfig =
module.exports = async () => ({
appId:
project === 'robot-stack' ? 'com.opentrons.app' : 'com.opentrons.appot3',
electronVersion: '23.3.13',
electronVersion: app.getVersion(),
npmRebuild: false,
releaseInfo: {
releaseNotesFile:
Expand Down
Loading