diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c8c98cf1..4cb1a6a0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,8 +84,6 @@ jobs: APPSTORE_USERNAME: ${{ secrets.APPSTORE_USERNAME }} APPSTORE_PASSWORD: ${{ secrets.APPSTORE_PASSWORD }} USE_HARD_LINKS: false - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} # DEBUG: electron-builder,electron-builder:* - name: Build packages without signing @@ -156,8 +154,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} USE_HARD_LINKS: false - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} # DEBUG: electron-builder,electron-builder:* - name: Build web resources @@ -269,8 +265,6 @@ jobs: WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }} WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }} DEBUG: electron-builder,electron-builder:* - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - name: Build packages without signing run: node scripts/build-windows.js diff --git a/app/package.json b/app/package.json index 442e1e45..be9fc1f3 100644 --- a/app/package.json +++ b/app/package.json @@ -8,7 +8,7 @@ "email": "e@ajenti.org" }, "main": "dist/main.js", - "version": "1.0.0", + "version": "1.0.0-alpha.1", "scripts": { "postinstall": "patch-package", "build": "webpack --progress --color --display-modules", diff --git a/electron-builder.yml b/electron-builder.yml index eab8754c..512ce8c6 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -35,9 +35,6 @@ extraResources: asarUnpack: - 'dist/*.map' publish: -- provider: s3 - bucket: tabby-updates - path: 'updates-${channel}-${env.ARCH}' - provider: github win: diff --git a/package.json b/package.json index 1545d0ac..8f9dddd2 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "graceful-fs": "^4.2.10", "html-loader": "3.1.0", "json-loader": "^0.5.7", + "thenby": "^1.3.4", "lru-cache": "^6.0.0", "macos-release": "^3.0.1", "ngx-sortablejs": "^11.1.0", @@ -74,7 +75,6 @@ "ssh2": "^1.10.0", "style-loader": "^3.3.1", "svg-inline-loader": "^0.8.2", - "thenby": "^1.3.4", "ts-loader": "^9.2.8", "tslib": "^2.3.1", "typedoc": "^0.22.15", diff --git a/scripts/build-linux.js b/scripts/build-linux.js index 2596eef1..78d80da6 100755 --- a/scripts/build-linux.js +++ b/scripts/build-linux.js @@ -1,10 +1,11 @@ #!/usr/bin/env node +/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */ const builder = require('electron-builder').build const vars = require('./vars') const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/') -process.env.ARCH = ((process.env.ARCH || process.arch) === 'arm') ? 'armv7l' : process.env.ARCH || process.arch +process.env.ARCH = (process.env.ARCH || process.arch) === 'arm' ? 'armv7l' : process.env.ARCH || process.arch builder({ dir: true, @@ -15,6 +16,10 @@ builder({ extraMetadata: { version: vars.version, }, + publish: { + provider: 'github', + channel: `latest-${process.arch}`, + }, }, - publish: isTag ? 'always' : 'onTag', + publish: isTag ? 'always' : 'onTagOrDraft', }).catch(() => process.exit(1)) diff --git a/scripts/build-macos.js b/scripts/build-macos.js index e449bc8f..2095feea 100755 --- a/scripts/build-macos.js +++ b/scripts/build-macos.js @@ -1,4 +1,5 @@ #!/usr/bin/env node +/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */ const builder = require('electron-builder').build const vars = require('./vars') @@ -24,8 +25,12 @@ builder({ identity: !process.env.CI || process.env.CSC_LINK ? undefined : null, }, npmRebuild: process.env.ARCH !== 'arm64', + publish: { + provider: 'github', + channel: `latest-${process.arch}`, + }, }, - publish: isTag ? 'always' : 'onTag', + publish: isTag ? 'always' : 'onTagOrDraft', }).catch(e => { console.error(e) process.exit(1) diff --git a/scripts/build-windows.js b/scripts/build-windows.js index 74e2d99e..d3b39239 100755 --- a/scripts/build-windows.js +++ b/scripts/build-windows.js @@ -1,9 +1,9 @@ #!/usr/bin/env node +/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */ const builder = require('electron-builder').build const vars = require('./vars') const isTag = (process.env.GITHUB_REF || process.env.BUILD_SOURCEBRANCH || '').startsWith('refs/tags/') -const isCI = !!process.env.GITHUB_REF process.env.ARCH = process.env.ARCH || process.arch @@ -15,6 +15,10 @@ builder({ extraMetadata: { version: vars.version, }, + publish: { + provider: 'github', + channel: `latest-${process.arch}`, + }, }, - publish: isTag ? 'always' : 'onTag', + publish: isTag ? 'always' : 'onTagOrDraft', }).catch(() => process.exit(1)) diff --git a/tabby-electron/src/services/updater.service.ts b/tabby-electron/src/services/updater.service.ts index 9315d332..855d658f 100644 --- a/tabby-electron/src/services/updater.service.ts +++ b/tabby-electron/src/services/updater.service.ts @@ -54,15 +54,12 @@ export class ElectronUpdaterService extends UpdaterService { config.ready$.toPromise().then(() => { if (config.store.enableAutomaticUpdates && this.electronUpdaterAvailable && !process.env.TABBY_DEV) { this.logger.debug('Checking for updates') - let arch = process.arch - if (process.platform === 'darwin' && process.arch === 'x64') { - arch = 'x86_64' - } try { this.autoUpdater.setFeedURL({ - provider: 's3', - bucket: 'tabby-updates', - path: `updates-latest-${arch}`, + provider: 'github', + repo: 'tabby', + owner: 'eugeny', + channel: `latest-${process.arch}`, }) this.autoUpdater.checkForUpdates() } catch (e) { diff --git a/yarn.lock b/yarn.lock index 96f89af7..b4cabd92 100644 --- a/yarn.lock +++ b/yarn.lock @@ -167,12 +167,10 @@ integrity sha512-7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ== dependencies: "@malept/cross-spawn-promise" "^1.1.0" - asar "^3.1.0" + asar "^3.0.3" debug "^4.3.1" dir-compare "^2.4.0" fs-extra "^9.0.1" - minimatch "^3.0.4" - plist "^3.0.4" "@eslint/eslintrc@^0.4.3": version "0.4.3" @@ -1039,10 +1037,10 @@ ansistyles@~0.1.3: resolved "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz" integrity sha1-XeYEFb2gcbs3EnhUyGT0GyMlRTk= -app-builder-bin@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0" - integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA== +app-builder-bin@3.7.1: + version "3.7.1" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.7.1.tgz#cb0825c5e12efc85b196ac3ed9c89f076c61040e" + integrity sha512-ql93vEUq6WsstGXD+SBLSIQw6SNnhbDEM0swzgugytMxLp3rT24Ag/jcC80ZHxiPRTdew1niuR7P3/FCrDqIjw== app-builder-lib@23.0.9: version "23.0.9" @@ -1164,7 +1162,7 @@ asap@~2.0.3: resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz" integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= -asar@^3.0.0: +asar@^3.0.0, asar@^3.0.3: version "3.0.3" resolved "https://registry.npmjs.org/asar/-/asar-3.0.3.tgz" integrity sha512-k7zd+KoR+n8pl71PvgElcoKHrVNiSXtw7odKbyNpmgKe7EGRF9Pnu3uLOukD37EvavKwVFxOUpqXTIZC5B5Pmw== @@ -1176,18 +1174,6 @@ asar@^3.0.0: optionalDependencies: "@types/glob" "^7.1.1" -asar@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz#70b0509449fe3daccc63beb4d3c7d2e24d3c6473" - integrity sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ== - dependencies: - chromium-pickle-js "^0.2.0" - commander "^5.0.0" - glob "^7.1.6" - minimatch "^3.0.4" - optionalDependencies: - "@types/glob" "^7.1.1" - asn1.js@^5.2.0: version "5.4.1" resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" @@ -1574,7 +1560,7 @@ builder-util@23.0.9: "7zip-bin" "~5.1.1" "@types/debug" "^4.1.6" "@types/fs-extra" "^9.0.11" - app-builder-bin "4.0.0" + app-builder-bin "3.7.1" bluebird-lst "^1.0.9" builder-util-runtime "9.0.2" chalk "^4.1.1" @@ -2732,10 +2718,10 @@ electron-notarize@^1.2.1: debug "^4.1.1" fs-extra "^9.0.1" -electron-osx-sign@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz#9b69c191d471d9458ef5b1e4fdd52baa059f1bb8" - integrity sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg== +electron-osx-sign@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz#fc258c5e896859904bbe3d01da06902c04b51c3a" + integrity sha512-icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ== dependencies: bluebird "^3.5.0" compare-version "^0.1.2" @@ -6441,7 +6427,7 @@ pkg-up@^2.0.0: dependencies: find-up "^2.1.0" -plist@^3.0.1, plist@^3.0.4: +plist@^3.0.1: version "3.0.5" resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.5.tgz#2cbeb52d10e3cdccccf0c11a63a85d830970a987" integrity sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==