Skip to content

Commit

Permalink
feature: skip testing on tags [WIP] (#2015)
Browse files Browse the repository at this point in the history
* updates config.yml

* Only publish on tags

* Updates pack and release notes whitelist

* Add back store_artifacts and remove persist to workspace

* update snapshots
  • Loading branch information
comountainclimber authored Nov 11, 2020
1 parent f56dc2d commit 1ef6bc2
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 13 deletions.
37 changes: 27 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,12 @@ jobs:
- run: yarn install --ignore-engines --frozen-lockfile --network-timeout 1000000 --network-concurrency 1
- run: yarn lint
- run: yarn flow
- run: yarn dist
- run: yarn assets
- save_cache:
key: neon-wallet-dependencies-cache-{{ checksum "yarn.lock" }}
paths:
- /usr/local/share/.cache/yarn/v2
- ./node_modules
- persist_to_workspace:
root: *workspace_root
paths:
- dist/*

test:
<<: *container_config
Expand Down Expand Up @@ -71,6 +67,26 @@ jobs:
- run: yarn install --ignore-engines --frozen-lockfile --network-timeout 1000000 --network-concurrency 1
- run: yarn assets
- run: yarn electron-builder -w --x64
- store_artifacts:
path: dist
destination: build

deploy_linux:
<<: *container_config
steps:
- checkout
- restore_cache:
key: neon-wallet-dependencies-cache-{{ checksum "yarn.lock" }}
- run: apt-get -y update
- run: apt-get -y install libusb-1.0-0-dev icnsutils graphicsmagick libudev-dev
- run: yarn config delete proxy
- run: yarn install --ignore-engines --frozen-lockfile --network-timeout 1000000 --network-concurrency 1
- run: yarn lint
- run: yarn flow
- run: yarn dist
- store_artifacts:
path: dist
destination: build

workflows:
version: 2
Expand All @@ -81,14 +97,15 @@ workflows:
tags:
only: /v.*/
- test:
filters:
tags:
only: /v.*/
requires:
- build
- deploy_win64:
requires:
- test
filters:
branches:
ignore: /.*/
tags:
only: /v.*/
- deploy_linux:
filters:
branches:
ignore: /.*/
Expand Down
2 changes: 1 addition & 1 deletion __tests__/components/__snapshots__/Settings.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1373,7 +1373,7 @@ exports[`Settings renders without crashing 1`] = `
Manage your neon wallet
</FormattedMessage>
- v
2.6.0
2.6.1
</div>
<div
className="settingsPanelHeaderItem"
Expand Down
2 changes: 1 addition & 1 deletion app/containers/Home/Home.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const LOGIN_OPTIONS = {
// NOTE: all other solutions seemed to be overly
// complex... Revisit this if it becomes painful
const shouldRenderReleaseNotes = version => {
const displayWhitelist = ['2.6.0']
const displayWhitelist = ['2.6.0', '2.6.1']
if (
displayWhitelist.includes(version) &&
!localStorage.getItem(`hasSeenReleaseNotes-${version}`)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Neon",
"version": "2.6.0",
"version": "2.6.1",
"main": "./main.js",
"description": "Light wallet for NEO blockchain",
"homepage": "https://github.com/CityOfZion/neon-wallet",
Expand Down

0 comments on commit 1ef6bc2

Please sign in to comment.