diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index 9ca09dc5d..ca8e9972b 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -1,6 +1,9 @@ name: Audit -on: [push] +on: + push: + branches: + - '**' jobs: audit: diff --git a/.github/workflows/debug-build.yml b/.github/workflows/debug-build.yml index 5d944c2e2..b78cda46c 100644 --- a/.github/workflows/debug-build.yml +++ b/.github/workflows/debug-build.yml @@ -53,6 +53,7 @@ jobs: uses: actions/checkout@v1 - uses: actions/cache@v2 + id: cache-node-modules with: path: '**/node_modules' key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }} @@ -81,6 +82,7 @@ jobs: # using separate run to install those packages separately - name: Install packages uses: nick-invision/retry@v2 + if: steps.cache-node-modules.outputs.cache-hit != 'true' with: timeout_seconds: 600 max_attempts: 3 @@ -88,6 +90,7 @@ jobs: command: yarn --frozen-lockfile --ignore-scripts - name: Install `app/` packages + if: steps.cache-node-modules.outputs.cache-hit != 'true' run: cd app && yarn --frozen-lockfile --ignore-scripts - name: Extract version @@ -111,7 +114,7 @@ jobs: - run: ls -R release - uses: actions/upload-artifact@v2 - name: ${{ matrix.os }} upload + name: ${{ matrix.NPM_COMMAND }} ${{ matrix.stx_network }} upload with: name: stacks-wallet-${{ matrix.stx_network }}-${{ matrix.NPM_COMMAND }} path: ${{ matrix.UPLOAD_ASSETS }} diff --git a/.github/workflows/exact-versions.yml b/.github/workflows/exact-versions.yml index 27e7321b4..d3689fad8 100644 --- a/.github/workflows/exact-versions.yml +++ b/.github/workflows/exact-versions.yml @@ -1,7 +1,9 @@ name: Exact versions -on: [push] - +on: + push: + branches: + - '**' jobs: check-versions: runs-on: ubuntu-latest @@ -10,14 +12,7 @@ jobs: - uses: actions/setup-node@v1 - - name: Cache node_modules - uses: actions/cache@v2 - with: - path: '**/node_modules' - key: ${{ hashFiles('**/yarn.lock') }} - - - name: Install dependencies - run: yarn install --ignore-scripts --ignore-optional + - run: yarn add @actions/core -E - name: Check exact versions - uses: ./.github/actions/check-version-lock + uses: .github/actions/check-version-lock diff --git a/.github/workflows/publish-version.yml b/.github/workflows/publish-version.yml index 48421573b..3721f5105 100644 --- a/.github/workflows/publish-version.yml +++ b/.github/workflows/publish-version.yml @@ -186,4 +186,4 @@ jobs: uses: Ilshidur/action-discord@master with: args: | - New release: [Stacks Wallet `v${{ needs.release.outputs.new_release_version }}`](https://github.com/${{ github.repository }}/releases/tag/v${{ needs.build.outputs.version }})) + New release: [Stacks Wallet `v${{ needs.build.outputs.version }}`](https://github.com/${{ github.repository }}/releases/tag/v${{ needs.build.outputs.version }})) diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml index 87323e724..ab2ce8d63 100644 --- a/.github/workflows/typecheck.yml +++ b/.github/workflows/typecheck.yml @@ -1,7 +1,9 @@ name: Typecheck -on: [push] - +on: + push: + branches: + - '**' jobs: build: runs-on: ubuntu-20.04 diff --git a/CHANGELOG.md b/CHANGELOG.md index e9a4d39a5..a4b1e3770 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [4.0.0-beta.12](https://github.com/blockstack/stacks-wallet/compare/v4.0.0-beta.11...v4.0.0-beta.12) (2021-01-09) + + +### Bug Fixes + +* issue with mainnet update available ([94fa75a](https://github.com/blockstack/stacks-wallet/commit/94fa75a708bec0c1356917f61a3778871ffd49fa)) + # [4.0.0-beta.11](https://github.com/blockstack/stacks-wallet/compare/v4.0.0-beta.10...v4.0.0-beta.11) (2021-01-09) diff --git a/app/hooks/use-check-for-updates.ts b/app/hooks/use-check-for-updates.ts index 9470d73a6..1a7baead6 100644 --- a/app/hooks/use-check-for-updates.ts +++ b/app/hooks/use-check-for-updates.ts @@ -7,6 +7,7 @@ import { WALLET_VERSION, NETWORK } from '@constants/index'; import { useInterval } from './use-interval'; const UPDATE_CHECK_INTERVAL = 120_000; +const NEW_WALLET_STARTING_MAJOR_VERSION = 4; export function useCheckForUpdates() { const [newerReleaseAvailable, setNewerReleaseAvailable] = useState(false); @@ -20,7 +21,12 @@ export function useCheckForUpdates() { // Prevent runtime errors incase an invalid tag makes it into upstream .filter(release => compareVersions.validate(release.tag_name)) .filter(release => (NETWORK === 'mainnet' ? !release.prerelease : release.prerelease)) - .filter(release => !release.tag_name.startsWith('v3')); + .filter(release => release.tag_name.startsWith('v')) + .filter( + release => + typeof release.tag_name[1] === 'number' && + release.tag_name[1] >= NEW_WALLET_STARTING_MAJOR_VERSION + ); if (latestReleases[0]) setLatestRelease(latestReleases[0]); diff --git a/electron-builder.js b/electron-builder.js index 3aa469857..e0219d9e1 100644 --- a/electron-builder.js +++ b/electron-builder.js @@ -35,7 +35,7 @@ const baseConfig = { ], }, win: { - target: ['nsis', 'msi'], + target: ['msi'], }, mac: { hardenedRuntime: true, @@ -49,12 +49,12 @@ const baseConfig = { buildResources: 'resources', output: 'release', }, - publish: { - provider: 'github', - owner: 'blockstack', - repo: 'blockstack', - private: false, - }, + // publish: { + // provider: 'github', + // owner: 'blockstack', + // repo: 'blockstack', + // private: false, + // }, // protocols: { // name: 'stacks-wallet', // schemes: ['stacks-wallet'], diff --git a/package.json b/package.json index 944aafb25..7a2aa89fc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "stacks-wallet", - "version": "4.0.0-beta.11", + "version": "4.0.0-beta.12", "description": "Stacks Wallet 2.0 — Stacking", "prettier": "@stacks/prettier-config", "homepage": "https://www.blockstack.org/testnet-wallet", diff --git a/scripts/notarize.js b/scripts/notarize.js index 5b2fca27c..caa086522 100644 --- a/scripts/notarize.js +++ b/scripts/notarize.js @@ -1,8 +1,8 @@ const { notarize } = require('electron-notarize'); -const appId = require('../electron-builder.js').appId +const { appId } = require('../electron-builder.js'); exports.default = async function notarizing(context) { - const { electronPlatformName, appOutDir } = context; + const { electronPlatformName, appOutDir } = context; if (electronPlatformName !== 'darwin') { return; } @@ -10,8 +10,8 @@ exports.default = async function notarizing(context) { const appName = context.packager.appInfo.productFilename; return await notarize({ - appBundleId: `${appId}`, - appPath: `${appOutDir}/${appName}.app`, + appBundleId: `${String(appId)}`, + appPath: `${String(appOutDir)}/${String(appName)}.app`, appleId: process.env.APPLE_ID, appleIdPassword: process.env.APPLE_ID_PASS, });