From bd043181119259cb5b43a618c8420cb9bb0cbaab Mon Sep 17 00:00:00 2001 From: Maxwell Lasky Date: Thu, 29 Oct 2020 17:56:34 -0600 Subject: [PATCH 01/12] test commit --- app/containers/Home/HomeLayout.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/app/containers/Home/HomeLayout.jsx b/app/containers/Home/HomeLayout.jsx index 152a5f47b..12b89d229 100644 --- a/app/containers/Home/HomeLayout.jsx +++ b/app/containers/Home/HomeLayout.jsx @@ -69,6 +69,7 @@ class HomeLayout extends React.Component {
+ test
{children} From 76c251760e9a73f21aa229ce380542d00eb9c48e Mon Sep 17 00:00:00 2001 From: Maxwell Lasky Date: Thu, 29 Oct 2020 18:10:43 -0600 Subject: [PATCH 02/12] update dist command --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4a7bfcf4b..06555fbe3 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "test:e2e": "ava __e2e__/*.e2e.js --timeout=120s -s", "test-watch": "jest --watch", "pack": "build --dir", - "dist": "yarn assets && dotenv yarn electron-builder --publish", + "dist": "yarn assets && dotenv yarn electron-builder --publish onTagOrDraft", "lint": "eslint -c .eslintrc ./app --ext .js,.jsx --ignore-pattern dist/", "lint-fix": "eslint -c .eslintrc ./app --ext .js,.jsx --fix --ignore-pattern dist/", "prepush": "echo 'running flow...' && yarn flow && echo 'running lint...' && yarn lint && echo 'running tests...' && yarn test", From 184c9768dac1004eff44c5e70711165ef0edf170 Mon Sep 17 00:00:00 2001 From: Maxwell Lasky Date: Thu, 29 Oct 2020 18:21:07 -0600 Subject: [PATCH 03/12] update config.yml --- .circleci/config.yml | 24 ++++++++++++------------ package.json | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b25fc4250..a2b71db03 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -111,15 +111,15 @@ workflows: - build deploy: jobs: - - deploy_win64 - # filters: - # branches: - # ignore: /.*/ - # tags: - # only: /[0-9]+(\.[0-9]+)+.*/ - - deploy_linux - # filters: - # branches: - # ignore: /.*/ - # tags: - # only: /[0-9]+(\.[0-9]+)+.*/ + - deploy_win64: + filters: + branches: + ignore: /.*/ + tags: + only: /[0-9]+(\.[0-9]+)+.*/ + - deploy_linux: + filters: + branches: + ignore: /.*/ + tags: + only: /[0-9]+(\.[0-9]+)+.*/ diff --git a/package.json b/package.json index 06555fbe3..4a7bfcf4b 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "test:e2e": "ava __e2e__/*.e2e.js --timeout=120s -s", "test-watch": "jest --watch", "pack": "build --dir", - "dist": "yarn assets && dotenv yarn electron-builder --publish onTagOrDraft", + "dist": "yarn assets && dotenv yarn electron-builder --publish", "lint": "eslint -c .eslintrc ./app --ext .js,.jsx --ignore-pattern dist/", "lint-fix": "eslint -c .eslintrc ./app --ext .js,.jsx --fix --ignore-pattern dist/", "prepush": "echo 'running flow...' && yarn flow && echo 'running lint...' && yarn lint && echo 'running tests...' && yarn test", From 9ae0813d8e35ba829bc5840b50f51b7715798c28 Mon Sep 17 00:00:00 2001 From: Maxwell Lasky Date: Thu, 29 Oct 2020 18:25:04 -0600 Subject: [PATCH 04/12] update config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a2b71db03..2ca86865f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -116,10 +116,10 @@ workflows: branches: ignore: /.*/ tags: - only: /[0-9]+(\.[0-9]+)+.*/ + only: /.*/ - deploy_linux: filters: branches: ignore: /.*/ tags: - only: /[0-9]+(\.[0-9]+)+.*/ + only: /.*/ From 0cb9f9793e59eaf7b15486f929479fc4bdb91148 Mon Sep 17 00:00:00 2001 From: Maxwell Lasky Date: Thu, 29 Oct 2020 18:41:44 -0600 Subject: [PATCH 05/12] Fix publish script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4a7bfcf4b..d7a9b4cd5 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "publish": [ { "provider": "github", - "owner": "CityOfZion", + "owner": "comountainclimber", "repo": "neon-wallet" } ], From f2675c630ad97b49bc194a632d3bcc9ec957cfbc Mon Sep 17 00:00:00 2001 From: Maxwell Lasky Date: Thu, 29 Oct 2020 18:56:15 -0600 Subject: [PATCH 06/12] update pack --- package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index d7a9b4cd5..c15b3ad84 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "test-watch": "jest --watch", "pack": "build --dir", "dist": "yarn assets && dotenv yarn electron-builder --publish", + "dist:mac": "yarn assets && dotenv yarn electron-builder --publish=always", "lint": "eslint -c .eslintrc ./app --ext .js,.jsx --ignore-pattern dist/", "lint-fix": "eslint -c .eslintrc ./app --ext .js,.jsx --fix --ignore-pattern dist/", "prepush": "echo 'running flow...' && yarn flow && echo 'running lint...' && yarn lint && echo 'running tests...' && yarn test", @@ -66,6 +67,9 @@ ] }, "mac": { + "target": [ + "dmg" + ], "hardenedRuntime": true, "entitlements": "./node_modules/electron-builder-notarize/entitlements.mac.inherit.plist", "artifactName": "${productName}.${version}.${ext}" @@ -73,7 +77,6 @@ "linux": { "target": [ "AppImage", - "snap", "deb" ], "artifactName": "${productName}.${version}.${ext}" From 00e6db7aa2937827056041d599a950a1a177b75b Mon Sep 17 00:00:00 2001 From: Maxwell Lasky Date: Thu, 29 Oct 2020 19:21:58 -0600 Subject: [PATCH 07/12] test commit --- app/containers/Home/HomeLayout.jsx | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/containers/Home/HomeLayout.jsx b/app/containers/Home/HomeLayout.jsx index 12b89d229..49efe39af 100644 --- a/app/containers/Home/HomeLayout.jsx +++ b/app/containers/Home/HomeLayout.jsx @@ -69,7 +69,7 @@ class HomeLayout extends React.Component {
- test + test (you auto-upgraded to 2.7.0!)
{children} diff --git a/package.json b/package.json index c15b3ad84..d24eee2ac 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "test-watch": "jest --watch", "pack": "build --dir", "dist": "yarn assets && dotenv yarn electron-builder --publish", - "dist:mac": "yarn assets && dotenv yarn electron-builder --publish=always", + "dist:mac": "yarn assets && dotenv yarn electron-builder --publish always", "lint": "eslint -c .eslintrc ./app --ext .js,.jsx --ignore-pattern dist/", "lint-fix": "eslint -c .eslintrc ./app --ext .js,.jsx --fix --ignore-pattern dist/", "prepush": "echo 'running flow...' && yarn flow && echo 'running lint...' && yarn lint && echo 'running tests...' && yarn test", From 05f632d50711dc83e4d829a0b38f2ffd89c96feb Mon Sep 17 00:00:00 2001 From: Maxwell Lasky Date: Thu, 29 Oct 2020 19:22:26 -0600 Subject: [PATCH 08/12] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d24eee2ac..2a55e37fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Neon", - "version": "2.6.0", + "version": "2.7.0", "main": "./main.js", "description": "Light wallet for NEO blockchain", "homepage": "https://github.com/CityOfZion/neon-wallet", From 7f92b4f2e86c856fa6f4326d66d1f6c13773c0d2 Mon Sep 17 00:00:00 2001 From: Maxwell Lasky Date: Thu, 29 Oct 2020 20:16:25 -0600 Subject: [PATCH 09/12] refactor config.yml --- .circleci/config.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2ca86865f..2c730826b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -103,23 +103,25 @@ jobs: workflows: version: 2 - build_test: + build_test_and_deploy: jobs: - build - test: requires: - build - deploy: - jobs: - deploy_win64: + requires: + - test filters: branches: ignore: /.*/ tags: - only: /.*/ + only: /v.*/ - deploy_linux: + requires: + - test filters: branches: ignore: /.*/ tags: - only: /.*/ + only: /v.*/ From 9f3ce9c2c605e393e7f2d21a20d34c315e45b7be Mon Sep 17 00:00:00 2001 From: Maxwell Lasky Date: Thu, 29 Oct 2020 20:21:44 -0600 Subject: [PATCH 10/12] refactor config.yml --- .circleci/config.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2c730826b..01545d70b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -105,8 +105,14 @@ workflows: version: 2 build_test_and_deploy: jobs: - - build + - build: + filters: + tags: + only: /v.*/ - test: + filters: + tags: + only: /v.*/ requires: - build - deploy_win64: From 1701bb010a8d48d9385f1dca95a2b04cd2f9c02e Mon Sep 17 00:00:00 2001 From: Maxwell Lasky Date: Thu, 29 Oct 2020 20:28:44 -0600 Subject: [PATCH 11/12] Revert unintentional changes --- app/containers/Home/HomeLayout.jsx | 1 - package.json | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/containers/Home/HomeLayout.jsx b/app/containers/Home/HomeLayout.jsx index 49efe39af..152a5f47b 100644 --- a/app/containers/Home/HomeLayout.jsx +++ b/app/containers/Home/HomeLayout.jsx @@ -69,7 +69,6 @@ class HomeLayout extends React.Component {
- test (you auto-upgraded to 2.7.0!)
{children} diff --git a/package.json b/package.json index 2a55e37fb..5a9609be7 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,9 @@ { "name": "Neon", - "version": "2.7.0", + "version": "2.6.0", "main": "./main.js", "description": "Light wallet for NEO blockchain", "homepage": "https://github.com/CityOfZion/neon-wallet", - "author": "Ethan Fast (https://github.com/Ejhfast)", "scripts": { "postinstall": "electron-builder install-app-deps", "start": "cross-env NODE_ENV=production electron .", @@ -18,7 +17,6 @@ "test-watch": "jest --watch", "pack": "build --dir", "dist": "yarn assets && dotenv yarn electron-builder --publish", - "dist:mac": "yarn assets && dotenv yarn electron-builder --publish always", "lint": "eslint -c .eslintrc ./app --ext .js,.jsx --ignore-pattern dist/", "lint-fix": "eslint -c .eslintrc ./app --ext .js,.jsx --fix --ignore-pattern dist/", "prepush": "echo 'running flow...' && yarn flow && echo 'running lint...' && yarn lint && echo 'running tests...' && yarn test", From 6dfa34be00d2937a4b6cb9f2b178f647f5add09a Mon Sep 17 00:00:00 2001 From: Maxwell Lasky Date: Thu, 29 Oct 2020 20:29:16 -0600 Subject: [PATCH 12/12] Revert unintentional changes --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5a9609be7..d6ce0ce96 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "publish": [ { "provider": "github", - "owner": "comountainclimber", + "owner": "CityOfZion", "repo": "neon-wallet" } ],