Commit baa9b5f

author

Alberto Iannaccone

authored

Automatically check for updates only once (#863)

* Automatically check for updates only once * set windows version to 2019 on CI

1 parent 481497e commit baa9b5fCopy full SHA for baa9b5f

File tree

5 files changed

+17

-9

lines changed

.github/workflows
- build.yml
arduino-ide-extension/src
- browser
  - arduino-frontend-contribution.tsx
  - ide-updater
    - ide-updater-commands.ts
- common/protocol
  - ide-updater.ts
- electron-main/ide-updater
  - ide-updater-impl.ts

5 files changed

+17

-9

lines changed

`‎.github/workflows/build.yml‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ jobs:`
`23`	`23`	`strategy:`
`24`	`24`	`matrix:`
`25`	`25`	`config:`
`26`		`- - os: windows-latest`
	`26`	`+ - os: windows-2019`
`27`	`27`	`- os: ubuntu-18.04 # https://github.com/arduino/arduino-ide/issues/259`
`28`	`28`	`- os: macos-latest`
`29`	`29`	`runs-on: ${{ matrix.config.os }}`

`‎arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ export class ArduinoFrontendContribution`
`282`	`282`	`this.updaterService.init(`
`283`	`283`	`this.arduinoPreferences.get('arduino.ide.updateChannel')`
`284`	`284`	`);`
`285`		`- this.updater.checkForUpdates().then(async (updateInfo) => {`
	`285`	`+ this.updater.checkForUpdates(true).then(async (updateInfo) => {`
`286`	`286`	`if (!updateInfo) return;`
`287`	`287`	`const versionToSkip = await this.localStorageService.getData<string>(`
`288`	`288`	`SKIP_IDE_VERSION`

`‎arduino-ide-extension/src/browser/ide-updater/ide-updater-commands.ts‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ export class IDEUpdaterCommands implements CommandContribution {`
`31`	`31`	`});`
`32`	`32`	`}`
`33`	`33`
`34`		`- async checkForUpdates(): Promise<UpdateInfo \| void> {`
`35`		`- return await this.updater.checkForUpdates();`
	`34`	`+ async checkForUpdates(initialCheck?: boolean): Promise<UpdateInfo \| void> {`
	`35`	`+ return await this.updater.checkForUpdates(initialCheck);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`async downloadUpdate(): Promise<void> {`

`‎arduino-ide-extension/src/common/protocol/ide-updater.ts‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ export const IDEUpdaterPath = '/services/ide-updater';`
`47`	`47`	`export const IDEUpdater = Symbol('IDEUpdater');`
`48`	`48`	`export interface IDEUpdater extends JsonRpcServer<IDEUpdaterClient> {`
`49`	`49`	`init(channel: UpdateChannel): void;`
`50`		`- checkForUpdates(): Promise<UpdateInfo \| void>;`
	`50`	`+ checkForUpdates(initialCheck?: boolean): Promise<UpdateInfo \| void>;`
`51`	`51`	`downloadUpdate(): Promise<void>;`
`52`	`52`	`quitAndInstall(): void;`
`53`	`53`	`stopDownload(): void;`

`‎arduino-ide-extension/src/electron-main/ide-updater/ide-updater-impl.ts‎`

Lines changed: 12 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,13 @@ const IDE_DOWNLOAD_BASE_URL = 'https://downloads.arduino.cc/arduino-ide';`
`12`	`12`
`13`	`13`	`@injectable()`
`14`	`14`	`export class IDEUpdaterImpl implements IDEUpdater {`
	`15`	`+ private isAlreadyChecked = false;`
`15`	`16`	`private updater = autoUpdater;`
`16`	`17`	`private cancellationToken?: CancellationToken;`
`17`	`18`	`protected theiaFEClient?: IDEUpdaterClient;`
`18`	`19`	`protected clients: Array<IDEUpdaterClient> = [];`
`19`	`20`
`20`		`- init(channel: UpdateChannel) {`
	`21`	`+ init(channel: UpdateChannel): void {`
`21`	`22`	`this.updater.autoDownload = false;`
`22`	`23`	`this.updater.channel = channel;`
`23`	`24`	`this.updater.setFeedURL({`
`@@ -52,9 +53,16 @@ export class IDEUpdaterImpl implements IDEUpdater {`
`52`	`53`	`if (client) this.clients.push(client);`
`53`	`54`	`}`
`54`	`55`
`55`		`- async checkForUpdates(): Promise<UpdateInfo \| void> {`
`56`		`- const { updateInfo, cancellationToken } =`
`57`		`- await this.updater.checkForUpdates();`
	`56`	`+ async checkForUpdates(initialCheck?: boolean): Promise<UpdateInfo \| void> {`
	`57`	`+ if (initialCheck) {`
	`58`	`+ if (this.isAlreadyChecked) return Promise.resolve();`
	`59`	`+ this.isAlreadyChecked = true;`
	`60`	`+ }`
	`61`	`+`
	`62`	`+ const {`
	`63`	`+ updateInfo,`
	`64`	`+ cancellationToken,`
	`65`	`+ } = await this.updater.checkForUpdates();`
`58`	`66`
`59`	`67`	`this.cancellationToken = cancellationToken;`
`60`	`68`	`if (this.updater.currentVersion.compare(updateInfo.version) === -1) {`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit baa9b5f

File tree

5 files changed

5 files changed

`‎.github/workflows/build.yml‎`

`‎arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx‎`

`‎arduino-ide-extension/src/browser/ide-updater/ide-updater-commands.ts‎`

`‎arduino-ide-extension/src/common/protocol/ide-updater.ts‎`

`‎arduino-ide-extension/src/electron-main/ide-updater/ide-updater-impl.ts‎`

0 commit comments