From bd7df9efe570699766d582ec04f13e073662a178 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 19:56:38 +0200 Subject: [PATCH 01/81] chore(circleci): improve build process --- .circleci/config.yml | 83 +++++++++++++++++++++++-------------------- electron-builder.json | 19 ++++++++++ package.json | 27 ++------------ 3 files changed, 67 insertions(+), 62 deletions(-) create mode 100644 electron-builder.json diff --git a/.circleci/config.yml b/.circleci/config.yml index 0d5b7e9f1..a958a5bba 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,23 +22,30 @@ references: xcode: '10.3.0' working_directory: *workspace -jobs: - build: - <<: *container_config - steps: +pre: &pre + - run: - checkout - restore_cache: keys: - - v1-dependencies-{{ checksum "package.json" }} - - v1-dependencies- + - v5-dependencies-test-{{ checksum "package.json" }} + - v5-dependencies-test - run: sudo apt-get -y update - - run: sudo apt-get -y install libudev-dev libusb-1.0-0-dev - - run: yarn install - - run: chmod -R 777 ~/repo - - save_cache: - paths: - - node_modules - key: v1-dependencies-{{ checksum "package.json" }} + - run: yarn + +post: &post + - save_cache: + paths: + - node_modules + key: v1-dependencies-test-{{ checksum "package.json" }} + +jobs: + build_linux: + <<: *container_config + steps: + <<: *pre + - yarn dist --linux + <<: *post + test: <<: *container_config steps: @@ -68,7 +75,7 @@ jobs: - run: dpkg --add-architecture i386 - run: apt-get -y update - run: apt-get -y install libudev-dev libudev-dev:i386 libusb-1.0-0-dev libusb-1.0-0-dev:i386 - - run: yarn install + - run: yarn - run: yarn release:win - store_artifacts: path: dist @@ -84,7 +91,7 @@ jobs: - v1-dependencies- - run: sudo apt-get -y update - run: sudo apt-get -y install build-essential libudev-dev - - run: yarn install + - run: yarn - run: yarn release:linux - store_artifacts: path: dist @@ -98,7 +105,7 @@ jobs: keys: - v3-dependencies-{{ checksum "package.json" }} - v3-dependencies- - - run: yarn install + - run: yarn - run: yarn release:mac - store_artifacts: path: dist @@ -108,28 +115,28 @@ workflows: version: 2 build_test: jobs: - - build + - build_linux - test: requires: - - build + - build_linux - deploy: - jobs: - - deploy_win: - filters: - branches: - ignore: /.*/ - tags: - only: /[v][0-9]+(\.[0-9]+)+.*/ - - deploy_linux: - filters: - branches: - ignore: /.*/ - tags: - only: /[v][0-9]+(\.[0-9]+)+.*/ - - deploy_mac: - filters: - branches: - ignore: /.*/ - tags: - only: /[v][0-9]+(\.[0-9]+)+.*/ + # deploy: + # jobs: + # - deploy_win: + # filters: + # branches: + # ignore: /.*/ + # tags: + # only: /[v][0-9]+(\.[0-9]+)+.*/ + # - deploy_linux: + # filters: + # branches: + # ignore: /.*/ + # tags: + # only: /[v][0-9]+(\.[0-9]+)+.*/ + # - deploy_mac: + # filters: + # branches: + # ignore: /.*/ + # tags: + # only: /[v][0-9]+(\.[0-9]+)+.*/ diff --git a/electron-builder.json b/electron-builder.json new file mode 100644 index 000000000..e7856f1d4 --- /dev/null +++ b/electron-builder.json @@ -0,0 +1,19 @@ +{ + "appId": "io.nos.desktop", + "forceCodeSigning": true, + "artifactName": "${productName}-${version}-${os}-${arch}.${ext}", + "win": { + "icon": "./static/icons/icon1024x1024.ico", + "timeStampServer": "http://timestamp.globalsign.com/scripts/timstamp.dll" + }, + "linux": { + "icon": "./static/icons/icon1024x1024.png" + }, + "directories": { + "buildResources": "static" + }, + "files": ["static/**/*"], + "publish": { + "provider": "github" + } +} diff --git a/package.json b/package.json index 2424b6174..12e808140 100644 --- a/package.json +++ b/package.json @@ -83,10 +83,9 @@ "lint:fix": "yarn lint --fix", "clean": "rimraf build dist coverage", "postinstall": "electron-builder install-app-deps", - "release": "yarn clean && yarn build && build", - "release:win": "yarn release --win --x64 --ia32 -p always", - "release:mac": "yarn release --mac -p always", - "release:linux": "yarn release --linux -p always", + "release:win": "yarn dist --win --x64 --ia32 -p onTag", + "release:mac": "yarn dist --mac -p onTag", + "release:linux": "yarn dist --linux -p onTag", "snyk-protect": "snyk protect", "snyk-test": "snyk test" }, @@ -145,26 +144,6 @@ "webpack-dev-server": "2.11.5", "webpack-merge": "4.2.1" }, - "build": { - "appId": "io.nos.desktop", - "forceCodeSigning": true, - "artifactName": "${productName}-${version}-${os}-${arch}.${ext}", - "win": { - "icon": "./static/icons/icon1024x1024.ico" - }, - "linux": { - "icon": "./static/icons/icon1024x1024.png" - }, - "directories": { - "buildResources": "static" - }, - "files": [ - "static/**/*" - ], - "publish": { - "provider": "github" - } - }, "jest": { "testMatch": [ "**/__tests__/**/*.test.js" From d98cf780fe2f4231cdc3f7945b42aaf313c2da45 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 20:14:48 +0200 Subject: [PATCH 02/81] chore(circleci): update --- .circleci/config.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a958a5bba..bb293a929 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -39,7 +39,7 @@ post: &post key: v1-dependencies-test-{{ checksum "package.json" }} jobs: - build_linux: + build: <<: *container_config steps: <<: *pre @@ -111,14 +111,16 @@ jobs: path: dist destination: build + workflows: version: 2 build_test: jobs: - - build_linux + - build - test: requires: - - build_linux + - build + # deploy: # jobs: From 1ca285dd0564b13f48409bdf8658d717ad413d16 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 20:20:20 +0200 Subject: [PATCH 03/81] circleci --- .circleci/config.yml | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bb293a929..b3fdcba4f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,4 @@ -# Javascript Node CircleCI 2.0 configuration file. -# Check https://circleci.com/docs/2.0/language-javascript/ for more details -version: 2 +version: 2.1 references: workspace: &workspace ~/repo @@ -22,29 +20,34 @@ references: xcode: '10.3.0' working_directory: *workspace -pre: &pre - - run: - - checkout - - restore_cache: - keys: - - v5-dependencies-test-{{ checksum "package.json" }} - - v5-dependencies-test - - run: sudo apt-get -y update - - run: yarn +commands: + pre: + description: "Setting up and building environment" + steps: + - run: + - checkout + - restore_cache: + keys: + - v5-dependencies-test-{{ checksum "package.json" }} + - v5-dependencies-test + - run: sudo apt-get -y update + - run: yarn + post: + - description: "Saves the cache" + - run: + - save_cache: + paths: + - node_modules + key: v1-dependencies-test-{{ checksum "package.json" }} -post: &post - - save_cache: - paths: - - node_modules - key: v1-dependencies-test-{{ checksum "package.json" }} jobs: build: <<: *container_config steps: - <<: *pre + - pre - yarn dist --linux - <<: *post + - post test: <<: *container_config @@ -113,7 +116,7 @@ jobs: workflows: - version: 2 + version: 2.1 build_test: jobs: - build From dd3892baa761b93a43abe036dd51d9af4c439015 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 20:25:37 +0200 Subject: [PATCH 04/81] fix --- .circleci/config.yml | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b3fdcba4f..d7336d81a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -36,10 +36,9 @@ commands: - description: "Saves the cache" - run: - save_cache: - paths: - - node_modules - key: v1-dependencies-test-{{ checksum "package.json" }} - + paths: + - node_modules + key: v1-dependencies-test-{{ checksum "package.json" }} jobs: build: @@ -123,25 +122,3 @@ workflows: - test: requires: - build - - - # deploy: - # jobs: - # - deploy_win: - # filters: - # branches: - # ignore: /.*/ - # tags: - # only: /[v][0-9]+(\.[0-9]+)+.*/ - # - deploy_linux: - # filters: - # branches: - # ignore: /.*/ - # tags: - # only: /[v][0-9]+(\.[0-9]+)+.*/ - # - deploy_mac: - # filters: - # branches: - # ignore: /.*/ - # tags: - # only: /[v][0-9]+(\.[0-9]+)+.*/ From e61f2ec80d116c23323eb5298d36b3e5e4da35eb Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 20:27:25 +0200 Subject: [PATCH 05/81] fix --- .circleci/config.yml | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d7336d81a..d43c36aa9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,22 +22,21 @@ references: commands: pre: - description: "Setting up and building environment" + description: 'Setting up and building environment' steps: - - run: - - checkout - - restore_cache: - keys: - - v5-dependencies-test-{{ checksum "package.json" }} - - v5-dependencies-test - - run: sudo apt-get -y update - - run: yarn + - checkout + - restore_cache: + keys: + - v5-dependencies-test-{{ checksum "package.json" }} + - v5-dependencies-test + - run: sudo apt-get -y update + - run: yarn post: - - description: "Saves the cache" - - run: - - save_cache: - paths: - - node_modules + - description: 'Saves the cache' + - steps: + - save_cache: + paths: + - node_modules key: v1-dependencies-test-{{ checksum "package.json" }} jobs: @@ -113,7 +112,6 @@ jobs: path: dist destination: build - workflows: version: 2.1 build_test: From 76d23c4828bb4d9477f186cc9b37390b156f5c7b Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 20:29:06 +0200 Subject: [PATCH 06/81] fixx --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d43c36aa9..eca9d3ff3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ references: commands: pre: - description: 'Setting up and building environment' + description: 'Setting up and building environmentt' steps: - checkout - restore_cache: From 862787f52ffd69fbed7aff0dac00467947489517 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 20:33:14 +0200 Subject: [PATCH 07/81] fix version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index eca9d3ff3..6149426dd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -113,7 +113,7 @@ jobs: destination: build workflows: - version: 2.1 + version: 2 build_test: jobs: - build From c2a67ee06c87f8723f1b9fa14d7031f4e4061cba Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 20:37:15 +0200 Subject: [PATCH 08/81] fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6149426dd..f9e8970c0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ references: commands: pre: - description: 'Setting up and building environmentt' + description: 'Setting up and building environment' steps: - checkout - restore_cache: From 5e586e062c3817697cfe928be072fcc27f1c6bea Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 20:49:14 +0200 Subject: [PATCH 09/81] fix --- .circleci/config.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f9e8970c0..0c1ec50f1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,13 +31,13 @@ commands: - v5-dependencies-test - run: sudo apt-get -y update - run: yarn - post: - - description: 'Saves the cache' - - steps: - - save_cache: - paths: - - node_modules - key: v1-dependencies-test-{{ checksum "package.json" }} + # post: + # - description: 'Saves the cache' + # - steps: + # - save_cache: + # paths: + # - node_modules + # key: v1-dependencies-test-{{ checksum "package.json" }} jobs: build: @@ -45,7 +45,7 @@ jobs: steps: - pre - yarn dist --linux - - post + # - post test: <<: *container_config @@ -61,9 +61,9 @@ jobs: - run: sudo apt-get -y install libgtk-3-0 libxss1 libgconf-2-4 libnss3 libasound2 - run: yarn test - run: yarn codecov - store_artifacts: - - path: artifacts - - destination: yarnpkg + # store_artifacts: + # - path: artifacts + # - destination: yarnpkg deploy_win: <<: *win_config From 5abb5f9b230b0af1bf212a25df058f61bee73a72 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 20:50:05 +0200 Subject: [PATCH 10/81] fix command --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0c1ec50f1..8084c4b0c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -44,7 +44,7 @@ jobs: <<: *container_config steps: - pre - - yarn dist --linux + - run: yarn dist --linux # - post test: From 17c5dfaf74aefb9729eeed83f9caad66fb5a99bb Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 20:52:48 +0200 Subject: [PATCH 11/81] fix lib --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8084c4b0c..befee389d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,8 @@ commands: keys: - v5-dependencies-test-{{ checksum "package.json" }} - v5-dependencies-test - - run: sudo apt-get -y update + - run: apt-get -y update + - run: apt-get -y install libudev-dev - run: yarn # post: # - description: 'Saves the cache' From 3072b0f9b6d3cd94c6f18c8ccc1bb294724deb7c Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 20:54:25 +0200 Subject: [PATCH 12/81] fix permissions --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index befee389d..62bfd45d0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,8 +29,8 @@ commands: keys: - v5-dependencies-test-{{ checksum "package.json" }} - v5-dependencies-test - - run: apt-get -y update - - run: apt-get -y install libudev-dev + - run: sudo apt-get -y update + - run: sudo apt-get -y install libudev-dev - run: yarn # post: # - description: 'Saves the cache' From e6687e62048f1656e4d8e462a87245192518e5d0 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 20:57:22 +0200 Subject: [PATCH 13/81] fix lib --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 62bfd45d0..000e1fb98 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ commands: - v5-dependencies-test-{{ checksum "package.json" }} - v5-dependencies-test - run: sudo apt-get -y update - - run: sudo apt-get -y install libudev-dev + - run: sudo apt-get -y install libusb-1.0-0 - run: yarn # post: # - description: 'Saves the cache' From a5d3b948c9ca2ab27d458f940cb605036bc2c8cc Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 21:09:24 +0200 Subject: [PATCH 14/81] fixtest --- .circleci/config.yml | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 000e1fb98..d8158fc0f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,5 +1,8 @@ version: 2.1 +orbs: + codecov: codecov/codecov@1.0.5 + references: workspace: &workspace ~/repo @@ -32,13 +35,13 @@ commands: - run: sudo apt-get -y update - run: sudo apt-get -y install libusb-1.0-0 - run: yarn - # post: - # - description: 'Saves the cache' - # - steps: - # - save_cache: - # paths: - # - node_modules - # key: v1-dependencies-test-{{ checksum "package.json" }} + post: + - description: 'Saves the cache' + - steps: + - save_cache: + paths: + - node_modules + key: v1-dependencies-test-{{ checksum "package.json" }} jobs: build: @@ -46,22 +49,16 @@ jobs: steps: - pre - run: yarn dist --linux - # - post + - post test: <<: *container_config steps: - - checkout - # Download and cache dependencies - - restore_cache: - keys: - - v1-dependencies-{{ checksum "package.json" }} - # fallback to using the latest cache if no exact match is found - - v1-dependencies- - - run: sudo apt-get -y update - - run: sudo apt-get -y install libgtk-3-0 libxss1 libgconf-2-4 libnss3 libasound2 + - pre - run: yarn test - run: yarn codecov + - codecov/upload: + file: ./coverage/lcov.info # store_artifacts: # - path: artifacts # - destination: yarnpkg From 1700060f46e9d2ac30d8a47fdf62fae28f6df18e Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 21:14:05 +0200 Subject: [PATCH 15/81] test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d8158fc0f..31ab12091 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -39,9 +39,9 @@ commands: - description: 'Saves the cache' - steps: - save_cache: + key: v1-dependencies-test-{{ checksum "package.json" }} paths: - node_modules - key: v1-dependencies-test-{{ checksum "package.json" }} jobs: build: From 94050b18c9dd217737a4843d65b3654687584c29 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 21:15:50 +0200 Subject: [PATCH 16/81] fix --- .circleci/config.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 31ab12091..0a38b67fe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -35,13 +35,6 @@ commands: - run: sudo apt-get -y update - run: sudo apt-get -y install libusb-1.0-0 - run: yarn - post: - - description: 'Saves the cache' - - steps: - - save_cache: - key: v1-dependencies-test-{{ checksum "package.json" }} - paths: - - node_modules jobs: build: @@ -49,7 +42,10 @@ jobs: steps: - pre - run: yarn dist --linux - - post + - save_cache: + key: v1-dependencies-test-{{ checksum "package.json" }} + paths: + - node_modules test: <<: *container_config From 213c341e076834506eb578878fa4c70172fe0a5c Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 21:17:23 +0200 Subject: [PATCH 17/81] fix orb --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0a38b67fe..9cea3d348 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,7 +25,7 @@ references: commands: pre: - description: 'Setting up and building environment' + description: 'Setting up and building environmentt' steps: - checkout - restore_cache: From d608e02e95d6cf899da5c5914838ecfc09a906fb Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 21:20:07 +0200 Subject: [PATCH 18/81] adjust --- .circleci/config.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9cea3d348..757fa762d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,7 +37,7 @@ commands: - run: yarn jobs: - build: + build_linux: <<: *container_config steps: - pre @@ -110,7 +110,5 @@ workflows: version: 2 build_test: jobs: - - build - - test: - requires: - - build + - build_linux + - test From 00c9350415d213f7dab0f2817ac4fa1c5d189ea7 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 21:20:56 +0200 Subject: [PATCH 19/81] trigger --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 757fa762d..447998300 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,7 +25,7 @@ references: commands: pre: - description: 'Setting up and building environmentt' + description: 'Setting up and building environment' steps: - checkout - restore_cache: From 2c23aa4aa629b6d0d8bb0244cbcc11246c5873f8 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 21:27:53 +0200 Subject: [PATCH 20/81] add windows --- .circleci/config.yml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 447998300..0acebdfc7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,7 +43,16 @@ jobs: - pre - run: yarn dist --linux - save_cache: - key: v1-dependencies-test-{{ checksum "package.json" }} + key: v5-dependencies-test-{{ checksum "package.json" }} + paths: + - node_modules + build_windows: + <<: *container_config + steps: + - pre + - run: yarn dist --win --x64 --ia32 + - save_cache: + key: v5-dependencies-test-{{ checksum "package.json" }} paths: - node_modules @@ -55,9 +64,6 @@ jobs: - run: yarn codecov - codecov/upload: file: ./coverage/lcov.info - # store_artifacts: - # - path: artifacts - # - destination: yarnpkg deploy_win: <<: *win_config @@ -110,5 +116,6 @@ workflows: version: 2 build_test: jobs: - - build_linux - - test + - build_windows + # - build_linux + # - test - RE ENABLE - BOTH WORK!!! From 27cd74826766833ec27519ac70c5056cd28d97c0 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 21:34:52 +0200 Subject: [PATCH 21/81] 32 support --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0acebdfc7..350480f0c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,9 +47,11 @@ jobs: paths: - node_modules build_windows: - <<: *container_config + <<: *win_config steps: + - run: dpkg --add-architecture i386 - pre + - run: sudo apt-get -y install libusb-1.0-0:i386 - run: yarn dist --win --x64 --ia32 - save_cache: key: v5-dependencies-test-{{ checksum "package.json" }} From d91e75962b8baa4a7167c9f6a63804a30af69078 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 21:38:30 +0200 Subject: [PATCH 22/81] sudo --- .circleci/config.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 350480f0c..64bf13ef3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,14 +32,15 @@ commands: keys: - v5-dependencies-test-{{ checksum "package.json" }} - v5-dependencies-test - - run: sudo apt-get -y update - - run: sudo apt-get -y install libusb-1.0-0 + - run: apt-get -y update + - run: apt-get -y install libusb-1.0-0 - run: yarn jobs: build_linux: <<: *container_config steps: + - run: chmod -R 777 ~/repo - pre - run: yarn dist --linux - save_cache: @@ -51,7 +52,7 @@ jobs: steps: - run: dpkg --add-architecture i386 - pre - - run: sudo apt-get -y install libusb-1.0-0:i386 + - run: apt-get -y install libusb-1.0-0:i386 - run: yarn dist --win --x64 --ia32 - save_cache: key: v5-dependencies-test-{{ checksum "package.json" }} @@ -119,5 +120,5 @@ workflows: build_test: jobs: - build_windows - # - build_linux + - build_linux # - test - RE ENABLE - BOTH WORK!!! From 968befb96fa18d8c779d6b47baff0a6296832eeb Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 21:39:54 +0200 Subject: [PATCH 23/81] su --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 64bf13ef3..7ce9077fb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ jobs: build_linux: <<: *container_config steps: - - run: chmod -R 777 ~/repo + - run: sudo -su - pre - run: yarn dist --linux - save_cache: From bffbf661315bcfd606930acb6ed048ce98c62cd3 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 21:41:39 +0200 Subject: [PATCH 24/81] i --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7ce9077fb..36b9c5285 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ jobs: build_linux: <<: *container_config steps: - - run: sudo -su + - run: sudo -i - pre - run: yarn dist --linux - save_cache: From 6eae62528513c8a220f157f238d8bd433913d07d Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 21:44:08 +0200 Subject: [PATCH 25/81] su --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 36b9c5285..43be94d61 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ jobs: build_linux: <<: *container_config steps: - - run: sudo -i + - run: su - - pre - run: yarn dist --linux - save_cache: From 882dc231ef8f75bddf5a190a3ad1d9f0e7537d56 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 21:46:53 +0200 Subject: [PATCH 26/81] commands --- .circleci/config.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 43be94d61..77b87797f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,22 +26,26 @@ references: commands: pre: description: 'Setting up and building environment' + parameters: + content: + type: string + default: "" steps: - checkout - restore_cache: keys: - v5-dependencies-test-{{ checksum "package.json" }} - v5-dependencies-test - - run: apt-get -y update - - run: apt-get -y install libusb-1.0-0 + - run: << parameters.sudo >> apt-get -y update + - run: << parameters.sudo >> apt-get -y install libusb-1.0-0 - run: yarn jobs: build_linux: <<: *container_config steps: - - run: su - - pre + - sudo: sudo - run: yarn dist --linux - save_cache: key: v5-dependencies-test-{{ checksum "package.json" }} From 0459ca4200db8761b6899ad35889f5b5dea883cb Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 21:49:32 +0200 Subject: [PATCH 27/81] str --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 77b87797f..238df1f98 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -45,7 +45,7 @@ jobs: <<: *container_config steps: - pre - - sudo: sudo + - sudo: "sudo" - run: yarn dist --linux - save_cache: key: v5-dependencies-test-{{ checksum "package.json" }} From f0e859953f286ac632ed703267b36a7f3358ad82 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 21:52:35 +0200 Subject: [PATCH 28/81] fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 238df1f98..828bbdba6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -45,7 +45,7 @@ jobs: <<: *container_config steps: - pre - - sudo: "sudo" + sudo: sudo - run: yarn dist --linux - save_cache: key: v5-dependencies-test-{{ checksum "package.json" }} From 92e9bc345a743f3e42b15421da41af6f87ed801d Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 21:53:50 +0200 Subject: [PATCH 29/81] f --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 828bbdba6..b0fab23fb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,9 +27,9 @@ commands: pre: description: 'Setting up and building environment' parameters: - content: - type: string - default: "" + sudo: + type: string + default: "" steps: - checkout - restore_cache: From e881eaecd706e1fe140faf440ae4aaa81e90e44b Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 21:56:21 +0200 Subject: [PATCH 30/81] ident --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b0fab23fb..7dca58ca8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -45,7 +45,7 @@ jobs: <<: *container_config steps: - pre - sudo: sudo + sudo: "sudo" - run: yarn dist --linux - save_cache: key: v5-dependencies-test-{{ checksum "package.json" }} From 5407330fa4a7e98de1552c6a8c8fb40e20bf2dd5 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sat, 17 Aug 2019 21:57:53 +0200 Subject: [PATCH 31/81] fix --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7dca58ca8..a8bf5d3df 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,7 @@ commands: parameters: sudo: type: string - default: "" + default: '' steps: - checkout - restore_cache: @@ -44,8 +44,8 @@ jobs: build_linux: <<: *container_config steps: - - pre - sudo: "sudo" + - pre: + sudo: 'sudo' - run: yarn dist --linux - save_cache: key: v5-dependencies-test-{{ checksum "package.json" }} From 6864c933fc83f9d7d0f9a6952ab745995e6591b3 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sun, 18 Aug 2019 10:03:38 +0200 Subject: [PATCH 32/81] add libdev --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a8bf5d3df..f19408e39 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,7 +37,7 @@ commands: - v5-dependencies-test-{{ checksum "package.json" }} - v5-dependencies-test - run: << parameters.sudo >> apt-get -y update - - run: << parameters.sudo >> apt-get -y install libusb-1.0-0 + - run: << parameters.sudo >> apt-get -y install libusb-1.0-0 libusb-dev - run: yarn jobs: From 151d91d164789f872ccc1831bd2e3b2cae6dcc92 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sun, 18 Aug 2019 10:12:02 +0200 Subject: [PATCH 33/81] fix --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f19408e39..c5e5c3bd9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,7 +37,8 @@ commands: - v5-dependencies-test-{{ checksum "package.json" }} - v5-dependencies-test - run: << parameters.sudo >> apt-get -y update - - run: << parameters.sudo >> apt-get -y install libusb-1.0-0 libusb-dev + - run: << parameters.sudo >> apt-get -y install libusb-1.0-0 + - run: << parameters.sudo >> apt-get -y libudev-dev # needed for windows - add when clause - run: yarn jobs: @@ -56,7 +57,7 @@ jobs: steps: - run: dpkg --add-architecture i386 - pre - - run: apt-get -y install libusb-1.0-0:i386 + - run: apt-get -y install libusb-1.0-0:i386 libudev-dev:i386 - run: yarn dist --win --x64 --ia32 - save_cache: key: v5-dependencies-test-{{ checksum "package.json" }} From 2fd929015ed898883fb1f7036d714eb48e603da3 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sun, 18 Aug 2019 10:12:21 +0200 Subject: [PATCH 34/81] remove --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c5e5c3bd9..e03c8292b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -125,5 +125,5 @@ workflows: build_test: jobs: - build_windows - - build_linux + # - build_linux # - test - RE ENABLE - BOTH WORK!!! From 2797c90fa41ebe015e53a8ccc773c3ca3692451b Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sun, 18 Aug 2019 10:14:38 +0200 Subject: [PATCH 35/81] fixx --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e03c8292b..f3fad1b4b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,7 +38,7 @@ commands: - v5-dependencies-test - run: << parameters.sudo >> apt-get -y update - run: << parameters.sudo >> apt-get -y install libusb-1.0-0 - - run: << parameters.sudo >> apt-get -y libudev-dev # needed for windows - add when clause + - run: << parameters.sudo >> apt-get -y install libudev-dev # needed for windows - add when clause - run: yarn jobs: From 794cbd4a6719d38feef1cf81818e51e74437077b Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sun, 18 Aug 2019 10:23:00 +0200 Subject: [PATCH 36/81] win --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f3fad1b4b..ef4cb14ea 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -57,7 +57,7 @@ jobs: steps: - run: dpkg --add-architecture i386 - pre - - run: apt-get -y install libusb-1.0-0:i386 libudev-dev:i386 + - run: apt-get -y install libudev-dev libudev-dev:i386 libusb-1.0-0-dev libusb-1.0-0-dev:i386 - run: yarn dist --win --x64 --ia32 - save_cache: key: v5-dependencies-test-{{ checksum "package.json" }} From 640c0233060d840ed2246020498320c540859fe6 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sun, 18 Aug 2019 12:28:25 +0200 Subject: [PATCH 37/81] test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ef4cb14ea..a3bd784d6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -57,7 +57,7 @@ jobs: steps: - run: dpkg --add-architecture i386 - pre - - run: apt-get -y install libudev-dev libudev-dev:i386 libusb-1.0-0-dev libusb-1.0-0-dev:i386 + - run: apt-get -y install libudev-dev:i386 libusb-1.0-0 libusb-1.0-0:i386 - run: yarn dist --win --x64 --ia32 - save_cache: key: v5-dependencies-test-{{ checksum "package.json" }} From d34703c3970d90cbb73702568d73d58d6cbf4145 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sun, 18 Aug 2019 12:41:03 +0200 Subject: [PATCH 38/81] add when step --- .circleci/config.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a3bd784d6..998a7a434 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,15 +30,22 @@ commands: sudo: type: string default: '' + windows: + type: boolean + default: false steps: - checkout - restore_cache: keys: - v5-dependencies-test-{{ checksum "package.json" }} - v5-dependencies-test + - run: << parameters.sudo >> apt-get -y update - run: << parameters.sudo >> apt-get -y install libusb-1.0-0 - - run: << parameters.sudo >> apt-get -y install libudev-dev # needed for windows - add when clause + - when: + condition: <> + steps: + - run: apt-get -y install libudev-dev libudev-dev:i386 libusb-1.0-0-dev libusb-1.0-0-dev:i386 - run: yarn jobs: @@ -56,8 +63,9 @@ jobs: <<: *win_config steps: - run: dpkg --add-architecture i386 - - pre - - run: apt-get -y install libudev-dev:i386 libusb-1.0-0 libusb-1.0-0:i386 + - pre: + windows: true + - run: apt-get -y install libudev-dev:i386 libusb-1.0-0-dev libusb-1.0-0-dev:i386 - run: yarn dist --win --x64 --ia32 - save_cache: key: v5-dependencies-test-{{ checksum "package.json" }} @@ -125,5 +133,5 @@ workflows: build_test: jobs: - build_windows - # - build_linux + - build_linux # - test - RE ENABLE - BOTH WORK!!! From b168cd65992f467b42c72f2a5335b5d7e6a8e14f Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sun, 18 Aug 2019 12:48:08 +0200 Subject: [PATCH 39/81] add mac --- .circleci/config.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 998a7a434..8dfcb1fa5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,15 +62,23 @@ jobs: build_windows: <<: *win_config steps: - - run: dpkg --add-architecture i386 + - run: dpkg --add-architecture i386 # needed for 32-bit support - pre: windows: true - - run: apt-get -y install libudev-dev:i386 libusb-1.0-0-dev libusb-1.0-0-dev:i386 - run: yarn dist --win --x64 --ia32 - save_cache: key: v5-dependencies-test-{{ checksum "package.json" }} paths: - node_modules + build_mac: + <<: *mac_config + steps: + - pre + - run: yarn dist --mac + - save_cache: + key: v5-dependencies-test-{{ checksum "package.json" }} + paths: + - node_modules test: <<: *container_config @@ -132,6 +140,7 @@ workflows: version: 2 build_test: jobs: - - build_windows - - build_linux + - build_mac + # - build_windows + # - build_linux # - test - RE ENABLE - BOTH WORK!!! From 3f3fbb352a159af3d0617f4ff0fc9c5afbe0762e Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sun, 18 Aug 2019 12:59:27 +0200 Subject: [PATCH 40/81] mac permissions --- .circleci/config.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8dfcb1fa5..9628bcdce 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -73,7 +73,12 @@ jobs: build_mac: <<: *mac_config steps: - - pre + - checkout + - restore_cache: + keys: + - v5-dependencies-test-mac-{{ checksum "package.json" }} + - v5-dependencies-test-mac- + - run: yarn - run: yarn dist --mac - save_cache: key: v5-dependencies-test-{{ checksum "package.json" }} From b708e4510e0a976c232781b7326e85e5a7816422 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sun, 18 Aug 2019 14:48:55 +0200 Subject: [PATCH 41/81] enable --- .circleci/config.yml | 38 ++++++++++++++------------------------ package.json | 2 +- 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9628bcdce..813689f1a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -59,7 +59,7 @@ jobs: key: v5-dependencies-test-{{ checksum "package.json" }} paths: - node_modules - build_windows: + build_win: <<: *win_config steps: - run: dpkg --add-architecture i386 # needed for 32-bit support @@ -81,7 +81,7 @@ jobs: - run: yarn - run: yarn dist --mac - save_cache: - key: v5-dependencies-test-{{ checksum "package.json" }} + key: v5-dependencies-test-mac-{{ checksum "package.json" }} paths: - node_modules @@ -97,15 +97,8 @@ jobs: deploy_win: <<: *win_config steps: - - checkout - - restore_cache: - keys: - - v1-dependencies-{{ checksum "package.json" }} - - v1-dependencies- - - run: dpkg --add-architecture i386 - - run: apt-get -y update - - run: apt-get -y install libudev-dev libudev-dev:i386 libusb-1.0-0-dev libusb-1.0-0-dev:i386 - - run: yarn + - pre: + windows: true - run: yarn release:win - store_artifacts: path: dist @@ -114,14 +107,8 @@ jobs: deploy_linux: <<: *container_config steps: - - checkout - - restore_cache: - keys: - - v1-dependencies-{{ checksum "package.json" }} - - v1-dependencies- - - run: sudo apt-get -y update - - run: sudo apt-get -y install build-essential libudev-dev - - run: yarn + - pre: + sudo: 'sudo' - run: yarn release:linux - store_artifacts: path: dist @@ -133,8 +120,8 @@ jobs: - checkout - restore_cache: keys: - - v3-dependencies-{{ checksum "package.json" }} - - v3-dependencies- + - v5-dependencies-test-mac-{{ checksum "package.json" }} + - v5-dependencies-test-mac- - run: yarn - run: yarn release:mac - store_artifacts: @@ -146,6 +133,9 @@ workflows: build_test: jobs: - build_mac - # - build_windows - # - build_linux - # - test - RE ENABLE - BOTH WORK!!! + - build_win + - build_linux + - deploy_mac + - deploy_win + - deploy_linux + - test diff --git a/package.json b/package.json index 12e808140..8b7514fdd 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "repository": "https://www.github.com/nos/client", "author": "nOS", "homepage": "https://nos.io", - "version": "0.6.0-rc.1", + "version": "0.6.0-rc.2", "private": true, "main": "dist/main/main.js", "license": "MIT", From f6fd6c6550afcd199504a2a83177497f63315cb0 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sun, 18 Aug 2019 14:51:03 +0200 Subject: [PATCH 42/81] fix tests --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 813689f1a..819ee0d56 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -88,7 +88,8 @@ jobs: test: <<: *container_config steps: - - pre + - pre: + sudo: 'sudo' - run: yarn test - run: yarn codecov - codecov/upload: From 1732eaa330a97e4efc9815cbc5eae23bc0f4ee9e Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sun, 18 Aug 2019 14:51:41 +0200 Subject: [PATCH 43/81] trigger --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 819ee0d56..14c9febd9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,7 +25,7 @@ references: commands: pre: - description: 'Setting up and building environment' + description: 'Setting up and building environmentt' parameters: sudo: type: string From 5e5094f156716f101329d554b8451c962f0ad0b2 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sun, 18 Aug 2019 14:58:32 +0200 Subject: [PATCH 44/81] fix cachce --- .circleci/config.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 14c9febd9..f91a16f00 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,8 +37,8 @@ commands: - checkout - restore_cache: keys: - - v5-dependencies-test-{{ checksum "package.json" }} - - v5-dependencies-test + - v6-dependencies-test-{{ checksum "package.json" }} + - v6-dependencies-test - run: << parameters.sudo >> apt-get -y update - run: << parameters.sudo >> apt-get -y install libusb-1.0-0 @@ -56,7 +56,7 @@ jobs: sudo: 'sudo' - run: yarn dist --linux - save_cache: - key: v5-dependencies-test-{{ checksum "package.json" }} + key: v6-dependencies-test-{{ checksum "package.json" }} paths: - node_modules build_win: @@ -67,7 +67,7 @@ jobs: windows: true - run: yarn dist --win --x64 --ia32 - save_cache: - key: v5-dependencies-test-{{ checksum "package.json" }} + key: v6-dependencies-test-{{ checksum "package.json" }} paths: - node_modules build_mac: @@ -76,12 +76,12 @@ jobs: - checkout - restore_cache: keys: - - v5-dependencies-test-mac-{{ checksum "package.json" }} - - v5-dependencies-test-mac- + - v6-dependencies-test-mac-{{ checksum "package.json" }} + - v6-dependencies-test-mac- - run: yarn - run: yarn dist --mac - save_cache: - key: v5-dependencies-test-mac-{{ checksum "package.json" }} + key: v6-dependencies-test-mac-{{ checksum "package.json" }} paths: - node_modules @@ -121,8 +121,8 @@ jobs: - checkout - restore_cache: keys: - - v5-dependencies-test-mac-{{ checksum "package.json" }} - - v5-dependencies-test-mac- + - v6-dependencies-test-mac-{{ checksum "package.json" }} + - v6-dependencies-test-mac- - run: yarn - run: yarn release:mac - store_artifacts: From 51ae603ac626fd80407ca7c65ed273ce4aeeaefe Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sun, 18 Aug 2019 15:02:41 +0200 Subject: [PATCH 45/81] remove storing arts --- .circleci/config.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f91a16f00..97839ea95 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -101,9 +101,6 @@ jobs: - pre: windows: true - run: yarn release:win - - store_artifacts: - path: dist - destination: build deploy_linux: <<: *container_config @@ -111,9 +108,6 @@ jobs: - pre: sudo: 'sudo' - run: yarn release:linux - - store_artifacts: - path: dist - destination: build deploy_mac: <<: *mac_config @@ -125,9 +119,6 @@ jobs: - v6-dependencies-test-mac- - run: yarn - run: yarn release:mac - - store_artifacts: - path: dist - destination: build workflows: version: 2 From 683eb8ab4663ba115a057c8364f471cf771e1060 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sun, 18 Aug 2019 17:31:49 +0200 Subject: [PATCH 46/81] arts --- .circleci/config.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 97839ea95..f91a16f00 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -101,6 +101,9 @@ jobs: - pre: windows: true - run: yarn release:win + - store_artifacts: + path: dist + destination: build deploy_linux: <<: *container_config @@ -108,6 +111,9 @@ jobs: - pre: sudo: 'sudo' - run: yarn release:linux + - store_artifacts: + path: dist + destination: build deploy_mac: <<: *mac_config @@ -119,6 +125,9 @@ jobs: - v6-dependencies-test-mac- - run: yarn - run: yarn release:mac + - store_artifacts: + path: dist + destination: build workflows: version: 2 From a2b71fb8537c358a84f736cc49ab593bdb29d79a Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sun, 18 Aug 2019 17:43:16 +0200 Subject: [PATCH 47/81] chore(circleci): seperate jobs --- .circleci/config.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f91a16f00..13d52c2db 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -131,12 +131,20 @@ jobs: workflows: version: 2 - build_test: + build_win: jobs: - - build_mac - build_win + build_linux: + jobs: - build_linux + build_mac: + jobs: + - build_mac + test: + jobs: + - test + deploy: + jobs: - deploy_mac - deploy_win - deploy_linux - - test From 00465ed656db5bd019f98a2c5072a827f90d5795 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sun, 18 Aug 2019 18:55:20 +0200 Subject: [PATCH 48/81] add conditional deploy --- .circleci/config.yml | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 13d52c2db..8eefa2a05 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -145,6 +145,21 @@ workflows: - test deploy: jobs: - - deploy_mac - - deploy_win - - deploy_linux + - deploy_win: + filters: + branches: + ignore: /.*/ + tags: + only: /[v][0-9]+(\.[0-9]+)+.*/ + - deploy_linux: + filters: + branches: + ignore: /.*/ + tags: + only: /[v][0-9]+(\.[0-9]+)+.*/ + - deploy_mac: + filters: + branches: + ignore: /.*/ + tags: + only: /[v][0-9]+(\.[0-9]+)+.*/ From 6a7787fe0029c43ff52d76daffef1fb378be280a Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sun, 18 Aug 2019 18:58:33 +0200 Subject: [PATCH 49/81] update cache values --- .circleci/config.yml | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8eefa2a05..474ec85be 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,8 +37,8 @@ commands: - checkout - restore_cache: keys: - - v6-dependencies-test-{{ checksum "package.json" }} - - v6-dependencies-test + - v6-dependencies-{{ checksum "package.json" }} + - v6-dependencies- - run: << parameters.sudo >> apt-get -y update - run: << parameters.sudo >> apt-get -y install libusb-1.0-0 @@ -56,7 +56,7 @@ jobs: sudo: 'sudo' - run: yarn dist --linux - save_cache: - key: v6-dependencies-test-{{ checksum "package.json" }} + key: v6-dependencies-{{ checksum "package.json" }} paths: - node_modules build_win: @@ -67,7 +67,7 @@ jobs: windows: true - run: yarn dist --win --x64 --ia32 - save_cache: - key: v6-dependencies-test-{{ checksum "package.json" }} + key: v6-dependencies-{{ checksum "package.json" }} paths: - node_modules build_mac: @@ -76,21 +76,20 @@ jobs: - checkout - restore_cache: keys: - - v6-dependencies-test-mac-{{ checksum "package.json" }} - - v6-dependencies-test-mac- + - v6-dependencies-mac-{{ checksum "package.json" }} + - v6-dependencies-mac- - run: yarn - run: yarn dist --mac - save_cache: - key: v6-dependencies-test-mac-{{ checksum "package.json" }} + key: v6-dependencies-mac-{{ checksum "package.json" }} paths: - node_modules - test: - <<: *container_config + : <<: *container_config steps: - pre: sudo: 'sudo' - - run: yarn test + - run: yarn - run: yarn codecov - codecov/upload: file: ./coverage/lcov.info @@ -121,8 +120,8 @@ jobs: - checkout - restore_cache: keys: - - v6-dependencies-test-mac-{{ checksum "package.json" }} - - v6-dependencies-test-mac- + - v6-dependencies-mac-{{ checksum "package.json" }} + - v6-dependencies-mac- - run: yarn - run: yarn release:mac - store_artifacts: @@ -140,9 +139,8 @@ workflows: build_mac: jobs: - build_mac - test: - jobs: - - test + : jobs: + - deploy: jobs: - deploy_win: From 5421f9b0623a590b867446487c043692168dc699 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Sun, 18 Aug 2019 19:31:31 +0200 Subject: [PATCH 50/81] add category --- electron-builder.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/electron-builder.json b/electron-builder.json index e7856f1d4..d6e02323a 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -9,6 +9,10 @@ "linux": { "icon": "./static/icons/icon1024x1024.png" }, + "mac": { + "icon": "./static/icons/icon1024x1024.icns", + "category": "public.app-category.utilities" + }, "directories": { "buildResources": "static" }, From fb01aa69e6948c06c86e3d962dfa39c8434131a1 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Mon, 19 Aug 2019 15:42:45 +0200 Subject: [PATCH 51/81] release test --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d195a9919..ca50410c1 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "repository": "https://www.github.com/nos/client", "author": "nOS", "homepage": "https://nos.io", - "version": "0.6.0-rc.2", + "version": "0.6.1", "private": true, "main": "dist/main/main.js", "license": "MIT", From 0945a16705fab47578906534d3ad17d787a456b4 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Mon, 19 Aug 2019 19:02:39 +0200 Subject: [PATCH 52/81] chore(app): add auto changelog/tagging/bumping and update readme --- .versionrc | 13 ++ README.md | 37 +++- package.json | 2 + renovate.json | 1 + yarn.lock | 491 +++++++++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 526 insertions(+), 18 deletions(-) create mode 100644 .versionrc diff --git a/.versionrc b/.versionrc new file mode 100644 index 000000000..def37f70e --- /dev/null +++ b/.versionrc @@ -0,0 +1,13 @@ +{ + "types": [ + {"type": "feat", "section": "Features"}, + {"type": "fix", "section": "Bug Fixes"}, + {"type": "chore", "section": "Bug Fixes"}, + {"type": "docs", "section": "Documentation"}, + {"type": "style", "hidden": true}, + {"type": "refactor", "hidden": true}, + {"type": "perf", "hidden": true}, + {"type": "test", "hidden": true}, + {"type": "renovate", "hidden": true} + ] +} \ No newline at end of file diff --git a/README.md b/README.md index 64f43bdc3..86bf1b38e 100644 --- a/README.md +++ b/README.md @@ -86,21 +86,21 @@ Resources: # Releasing -## Windows & Linux +## Automated Deployment We use [CircleCI](https://circleci.com/gh/nos/client) to automatically create builds based upon git tags. -1. Create a tag, e.g. `v1.0.0`. - 1. `git tag -a v1.0.0 -m "release"` - the `v`-prefix is required for auto updates to work - 2. `git push origin v1.0.0` -2. Wait for `deploy_win64` and `deploy_linux` jobs to upload the artifacts to Github Release page as a draft. +1. run `yarn release --dry-run` - Note if the output version tag/changelog is correctly generated. +2. run `yarn release` - This will generate the changelog, update the version in package.json and create and push a tag. +3. The deploys jobs will be triggered and upload the artifacts to Github Release page as a draft. -## macOS +## Manual Deployment: macOS 1. Export the following variables: 1. `CSC_LINK` - This is the path to the .p12 certificate file 2. `CSC_KEY_PASSWORD` - This is the password of the .p12 certificate file 3. `CSC_IDENTITY_AUTO_DISCOVERY` - Set to `false` to disable usage of local keychain (By default it looks in your `login` keychain) + 4. `GH_TOKEN` - This is used to upload the artifacts to Github 2. Create the distributable, i.e. `yarn dist`. 3. Locate and upload the following files as these are required for the auto-updater to work: 1. `dist/nOS-1.0.0-mac.zip` @@ -108,5 +108,26 @@ We use [CircleCI](https://circleci.com/gh/nos/client) to automatically create bu 3. `dist/nOS-1.0.0-mac.dmg.blockmap` 4. `dist/latest-mac.yml` -##### Generating hashes for the artifacts -- MacOS: `shasum -a 256 ./*` - Where the final argument is the location of the artifacts \ No newline at end of file +## Manual Deployment: Linux + +1. Create the distributable, i.e. `yarn dist`. +2. Locate and upload the following files as these are required for the auto-updater to work: + 1. `dist/nOS-1.0.0-linux-amd64.snap` + 2. `dist/nOS-1.0.0-linux-x86_64.AppImage` + 3. `dist/latest-linux.yml` + +## Manual Deployment: Windows + +1. Export the following variables: + 1. `WIN_CSC_LINK` - This is the certificate file in text format + 2. `WIN_CSC_KEY_PASSWORD` - This is the password of the certificate file + 3. `GH_TOKEN` - This is used to upload the artifacts to Github +2. Create the distributable, i.e. `yarn dist`. +3. Locate and upload the following files as these are required for the auto-updater to work: + 1. `dist/nOS-1.0.0-win.exe` + 2. `dist/nOS-1.0.0-win.exe.blockmap` + 3. `dist/latest.yml` + +### Generating hashes for the artifacts + +- MacOS/Linux: `shasum -a 256 ./*` - Where the final argument is the location of the artifacts diff --git a/package.json b/package.json index ca50410c1..96cb3a9b0 100644 --- a/package.json +++ b/package.json @@ -83,6 +83,7 @@ "lint:fix": "yarn lint --fix", "clean": "rimraf build dist coverage", "postinstall": "electron-builder install-app-deps", + "release": "standard-version", "release:win": "yarn dist --win --x64 --ia32 -p onTag", "release:mac": "yarn dist --mac -p onTag", "release:linux": "yarn dist --linux -p onTag", @@ -133,6 +134,7 @@ "redux-mock-store": "1.5.3", "rimraf": "3.0.0", "sass-loader": "7.2.0", + "standard-version": "7.0.0", "style-loader": "0.23.1", "stylelint": "10.1.0", "stylelint-config-recommended-scss": "3.3.0", diff --git a/renovate.json b/renovate.json index 2039cbc7a..b17003032 100644 --- a/renovate.json +++ b/renovate.json @@ -3,6 +3,7 @@ "ignoreDeps": ["@ledgerhq/hw-transport-node-hid"], "schedule": ["on monday"], "labels": ["Renovate 🌴"], + "semanticCommitType": "renovate", "statusCheckVerify": true, "packageRules": [ { diff --git a/yarn.lock b/yarn.lock index e1301dff3..a7b875bf1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -487,6 +487,14 @@ resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== +JSONStream@^1.0.4: + version "1.3.5" + resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" + integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== + dependencies: + jsonparse "^1.2.0" + through ">=2.2.7 <3" + abab@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f" @@ -860,6 +868,11 @@ array-flatten@^2.1.0: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== +array-ify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece" + integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4= + array-includes@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d" @@ -2829,6 +2842,14 @@ commondir@^1.0.1: resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= +compare-func@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648" + integrity sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg= + dependencies: + array-ify "^1.0.0" + dot-prop "^3.0.0" + compare-version@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" @@ -2886,6 +2907,16 @@ concat-stream@1.6.2, concat-stream@^1.5.0: readable-stream "^2.2.2" typedarray "^0.0.6" +concat-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1" + integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.0.2" + typedarray "^0.0.6" + configstore@^3.0.0, configstore@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f" @@ -2950,6 +2981,169 @@ content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== +conventional-changelog-angular@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.3.tgz#299fdd43df5a1f095283ac16aeedfb0a682ecab0" + integrity sha512-YD1xzH7r9yXQte/HF9JBuEDfvjxxwDGGwZU1+ndanbY0oFgA+Po1T9JDSpPLdP0pZT6MhCAsdvFKC4TJ4MTJTA== + dependencies: + compare-func "^1.3.1" + q "^1.5.1" + +conventional-changelog-atom@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-2.0.1.tgz#dc88ce650ffa9ceace805cbe70f88bfd0cb2c13a" + integrity sha512-9BniJa4gLwL20Sm7HWSNXd0gd9c5qo49gCi8nylLFpqAHhkFTj7NQfROq3f1VpffRtzfTQp4VKU5nxbe2v+eZQ== + dependencies: + q "^1.5.1" + +conventional-changelog-codemirror@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-2.0.1.tgz#acc046bc0971460939a0cc2d390e5eafc5eb30da" + integrity sha512-23kT5IZWa+oNoUaDUzVXMYn60MCdOygTA2I+UjnOMiYVhZgmVwNd6ri/yDlmQGXHqbKhNR5NoXdBzSOSGxsgIQ== + dependencies: + q "^1.5.1" + +conventional-changelog-config-spec@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-config-spec/-/conventional-changelog-config-spec-2.0.0.tgz#a9e8c9225d4a922d25f4ac501e454274ae4ad0b3" + integrity sha512-zQmcBP/pR8tN5MSv+nXG9hOmy+Z6rgEquBerpoEbOKTFPLoxBy/adeUUpshrMpqdZ/ycqbT2AgdTtiIu/9IHGg== + +conventional-changelog-conventionalcommits@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.1.0.tgz#eb7d47a9c5f1a6f9846a649482294e4ac50d7683" + integrity sha512-J3xolGrH8PTxpCqueHOuZtv3Cp73SQOWiBQzlsaugZAZ+hZgcJBonmC+1bQbfGs2neC2S18p2L1Gx+nTEglJTQ== + dependencies: + compare-func "^1.3.1" + q "^1.5.1" + +conventional-changelog-core@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.2.3.tgz#b31410856f431c847086a7dcb4d2ca184a7d88fb" + integrity sha512-LMMX1JlxPIq/Ez5aYAYS5CpuwbOk6QFp8O4HLAcZxe3vxoCtABkhfjetk8IYdRB9CDQGwJFLR3Dr55Za6XKgUQ== + dependencies: + conventional-changelog-writer "^4.0.6" + conventional-commits-parser "^3.0.3" + dateformat "^3.0.0" + get-pkg-repo "^1.0.0" + git-raw-commits "2.0.0" + git-remote-origin-url "^2.0.0" + git-semver-tags "^2.0.3" + lodash "^4.2.1" + normalize-package-data "^2.3.5" + q "^1.5.1" + read-pkg "^3.0.0" + read-pkg-up "^3.0.0" + through2 "^3.0.0" + +conventional-changelog-ember@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-2.0.2.tgz#284ffdea8c83ea8c210b65c5b4eb3e5cc0f4f51a" + integrity sha512-qtZbA3XefO/n6DDmkYywDYi6wDKNNc98MMl2F9PKSaheJ25Trpi3336W8fDlBhq0X+EJRuseceAdKLEMmuX2tg== + dependencies: + q "^1.5.1" + +conventional-changelog-eslint@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.2.tgz#e9eb088cda6be3e58b2de6a5aac63df0277f3cbe" + integrity sha512-Yi7tOnxjZLXlCYBHArbIAm8vZ68QUSygFS7PgumPRiEk+9NPUeucy5Wg9AAyKoBprSV3o6P7Oghh4IZSLtKCvQ== + dependencies: + q "^1.5.1" + +conventional-changelog-express@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-2.0.1.tgz#fea2231d99a5381b4e6badb0c1c40a41fcacb755" + integrity sha512-G6uCuCaQhLxdb4eEfAIHpcfcJ2+ao3hJkbLrw/jSK/eROeNfnxCJasaWdDAfFkxsbpzvQT4W01iSynU3OoPLIw== + dependencies: + q "^1.5.1" + +conventional-changelog-jquery@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/conventional-changelog-jquery/-/conventional-changelog-jquery-3.0.4.tgz#7eb598467b83db96742178e1e8d68598bffcd7ae" + integrity sha512-IVJGI3MseYoY6eybknnTf9WzeQIKZv7aNTm2KQsiFVJH21bfP2q7XVjfoMibdCg95GmgeFlaygMdeoDDa+ZbEQ== + dependencies: + q "^1.5.1" + +conventional-changelog-jshint@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-2.0.1.tgz#11c0e8283abf156a4ff78e89be6fdedf9bd72202" + integrity sha512-kRFJsCOZzPFm2tzRHULWP4tauGMvccOlXYf3zGeuSW4U0mZhk5NsjnRZ7xFWrTFPlCLV+PNmHMuXp5atdoZmEg== + dependencies: + compare-func "^1.3.1" + q "^1.5.1" + +conventional-changelog-preset-loader@^2.1.1, conventional-changelog-preset-loader@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.2.0.tgz#571e2b3d7b53d65587bea9eedf6e37faa5db4fcc" + integrity sha512-zXB+5vF7D5Y3Cb/rJfSyCCvFphCVmF8mFqOdncX3BmjZwAtGAPfYrBcT225udilCKvBbHgyzgxqz2GWDB5xShQ== + +conventional-changelog-writer@^4.0.6: + version "4.0.7" + resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.7.tgz#e4b7d9cbea902394ad671f67108a71fa90c7095f" + integrity sha512-p/wzs9eYaxhFbrmX/mCJNwJuvvHR+j4Fd0SQa2xyAhYed6KBiZ780LvoqUUvsayP4R1DtC27czalGUhKV2oabw== + dependencies: + compare-func "^1.3.1" + conventional-commits-filter "^2.0.2" + dateformat "^3.0.0" + handlebars "^4.1.2" + json-stringify-safe "^5.0.1" + lodash "^4.2.1" + meow "^4.0.0" + semver "^6.0.0" + split "^1.0.0" + through2 "^3.0.0" + +conventional-changelog@3.1.9: + version "3.1.9" + resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.1.9.tgz#5a6a19dadc1e4080c2db8dcddd00a6c0077c55a4" + integrity sha512-JbNVm1iGZ3aXxcFZjqKNDNfdgchQjSltWc8rvSniMrkHLsub9Wn20/JLdJNTBM74dt1IA2M+v/mzServ6N37YA== + dependencies: + conventional-changelog-angular "^5.0.3" + conventional-changelog-atom "^2.0.1" + conventional-changelog-codemirror "^2.0.1" + conventional-changelog-conventionalcommits "^4.0.0" + conventional-changelog-core "^3.2.3" + conventional-changelog-ember "^2.0.2" + conventional-changelog-eslint "^3.0.2" + conventional-changelog-express "^2.0.1" + conventional-changelog-jquery "^3.0.4" + conventional-changelog-jshint "^2.0.1" + conventional-changelog-preset-loader "^2.1.1" + +conventional-commits-filter@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.2.tgz#f122f89fbcd5bb81e2af2fcac0254d062d1039c1" + integrity sha512-WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ== + dependencies: + lodash.ismatch "^4.4.0" + modify-values "^1.0.0" + +conventional-commits-parser@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.3.tgz#c3f972fd4e056aa8b9b4f5f3d0e540da18bf396d" + integrity sha512-KaA/2EeUkO4bKjinNfGUyqPTX/6w9JGshuQRik4r/wJz7rUw3+D3fDG6sZSEqJvKILzKXFQuFkpPLclcsAuZcg== + dependencies: + JSONStream "^1.0.4" + is-text-path "^2.0.0" + lodash "^4.2.1" + meow "^4.0.0" + split2 "^2.0.0" + through2 "^3.0.0" + trim-off-newlines "^1.0.0" + +conventional-recommended-bump@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-6.0.0.tgz#bdafad56bc32bc04d58dbbd8bd6b750375500edc" + integrity sha512-iIHkDOuWCC49J/E4WXvXBCCrO2NoGqwjfhm2iUOHPPEik8TVHxczt/hFaWY+4MXeZ/nC53BNfjmlr8+EXOrlvA== + dependencies: + concat-stream "^2.0.0" + conventional-changelog-preset-loader "^2.2.0" + conventional-commits-filter "^2.0.2" + conventional-commits-parser "^3.0.3" + git-raw-commits "2.0.0" + git-semver-tags "^3.0.0" + meow "^4.0.0" + q "^1.5.1" + convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.1: version "1.6.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20" @@ -3506,6 +3700,13 @@ damerau-levenshtein@^1.0.4: resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz#780cf7144eb2e8dbd1c3bb83ae31100ccc31a414" integrity sha512-CBCRqFnpu715iPmw1KrdOrzRqbdFwQTwAWyyyYS42+iAgHCuXZ+/TdMgQkUENPomxEz9z1BEzuQU2Xw0kUuAgA== +dargs@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17" + integrity sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc= + dependencies: + number-is-nan "^1.0.0" + dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" @@ -3534,6 +3735,11 @@ date-now@^0.1.4: resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs= +dateformat@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" + integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== + debug@2.6.9, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -3714,6 +3920,11 @@ detect-file@^1.0.0: resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= +detect-indent@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd" + integrity sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA== + detect-indent@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" @@ -3726,6 +3937,11 @@ detect-libc@^1.0.2, detect-libc@^1.0.3: resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= +detect-newline@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.0.0.tgz#8ae477c089e51872c264531cd6547719c0b86b2f" + integrity sha512-JAP22dVPAqvhdRFFxK1G5GViIokyUn0UWXRNW0ztK96fsqi9cuM8w8ESbSk+T2w5OVorcMcL6m7yUg1RrX+2CA== + detect-newline@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" @@ -3915,6 +4131,13 @@ domutils@^1.5.1, domutils@^1.7.0: dom-serializer "0" domelementtype "1" +dot-prop@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177" + integrity sha1-G3CK8JSknJoOfbyteQq6U52sEXc= + dependencies: + is-obj "^1.0.0" + dot-prop@^4.1.0, dot-prop@^4.1.1: version "4.2.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" @@ -3942,6 +4165,14 @@ dotenv@^8.0.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.0.0.tgz#ed310c165b4e8a97bb745b0a9d99c31bda566440" integrity sha512-30xVGqjLjiUOArT4+M5q9sYdvuR4riM6yK9wMcas9Vbp6zZa+ocC9dp6QoftuhTPhFAiLK/0C5Ni2nou/Bk8lg== +dotgitignore@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/dotgitignore/-/dotgitignore-2.1.0.tgz#a4b15a4e4ef3cf383598aaf1dfa4a04bcc089b7b" + integrity sha512-sCm11ak2oY6DglEPpCB8TixLjWAxd3kJTs6UIcSasNYxXdFPV+YKlye92c8H4kKFqV5qYMIh7d+cYecEg0dIkA== + dependencies: + find-up "^3.0.0" + minimatch "^3.0.4" + dotnet-deps-parser@4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/dotnet-deps-parser/-/dotnet-deps-parser-4.5.0.tgz#53ef53a058dec156fcdf9008b880ecc9675ddde0" @@ -5101,6 +5332,13 @@ fd-slicer@~1.0.1: dependencies: pend "~1.2.0" +figures@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-3.0.0.tgz#756275c964646163cc6f9197c7a0295dbfd04de9" + integrity sha512-HKri+WoWoUgr83pehn/SIgLOMZ9nAWC6dcGj26RY2R4F50u4+RTUz0RCrUlOV3nKRAICW1UGzyb+kcX2qK1S/g== + dependencies: + escape-string-regexp "^1.0.5" + figures@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" @@ -5204,6 +5442,14 @@ find-cache-dir@^1.0.0: make-dir "^1.0.0" pkg-dir "^2.0.0" +find-up@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + find-up@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" @@ -5347,6 +5593,13 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" +fs-access@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/fs-access/-/fs-access-1.0.1.tgz#d6a87f262271cefebec30c553407fb995da8777a" + integrity sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o= + dependencies: + null-check "^1.0.0" + fs-constants@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" @@ -5528,6 +5781,17 @@ get-func-name@^2.0.0: resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= +get-pkg-repo@^1.0.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d" + integrity sha1-xztInAbYDMVTbCyFP54FIyBWly0= + dependencies: + hosted-git-info "^2.1.4" + meow "^3.3.0" + normalize-package-data "^2.3.0" + parse-github-repo-url "^1.3.0" + through2 "^2.0.0" + get-stdin@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" @@ -5586,6 +5850,41 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" +git-raw-commits@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.0.tgz#d92addf74440c14bcc5c83ecce3fb7f8a79118b5" + integrity sha512-w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg== + dependencies: + dargs "^4.0.1" + lodash.template "^4.0.2" + meow "^4.0.0" + split2 "^2.0.0" + through2 "^2.0.0" + +git-remote-origin-url@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f" + integrity sha1-UoJlna4hBxRaERJhEq0yFuxfpl8= + dependencies: + gitconfiglocal "^1.0.0" + pify "^2.3.0" + +git-semver-tags@3.0.0, git-semver-tags@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-3.0.0.tgz#fe10147824657662c82efd9341f0fa59f74ddcba" + integrity sha512-T4C/gJ9k2Bnxz+PubtcyiMtUUKrC+Nh9Q4zaECcnmVMwJgPhrNyP/Rf+YpdRqsJbCV/+kYrCH24Xg+IeAmbOPg== + dependencies: + meow "^4.0.0" + semver "^6.0.0" + +git-semver-tags@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-2.0.3.tgz#48988a718acf593800f99622a952a77c405bfa34" + integrity sha512-tj4FD4ww2RX2ae//jSrXZzrocla9db5h0V7ikPl1P/WwoZar9epdUhwR7XHXSgc+ZkNq72BEEerqQuicoEQfzA== + dependencies: + meow "^4.0.0" + semver "^6.0.0" + git-up@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/git-up/-/git-up-4.0.1.tgz#cb2ef086653640e721d2042fe3104857d89007c0" @@ -5601,6 +5900,13 @@ git-url-parse@11.1.2: dependencies: git-up "^4.0.0" +gitconfiglocal@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b" + integrity sha1-QdBF84UaXqiPA/JMocYXgRRGS5s= + dependencies: + ini "^1.3.2" + github-from-package@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" @@ -5816,7 +6122,7 @@ handle-thing@^2.0.0: resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754" integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ== -handlebars@^4.0.3: +handlebars@^4.0.3, handlebars@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67" integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw== @@ -6371,7 +6677,7 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@^1.3.0, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: +ini@^1.3.0, ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== @@ -6831,6 +7137,13 @@ is-symbol@^1.0.2: dependencies: has-symbols "^1.0.0" +is-text-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-2.0.0.tgz#b2484e2b720a633feb2e85b67dc193ff72c75636" + integrity sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw== + dependencies: + text-extensions "^2.0.0" + is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" @@ -7476,6 +7789,11 @@ jsonify@~0.0.0: resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM= +jsonparse@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" + integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= + jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" @@ -7730,6 +8048,13 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + lockfile@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.4.tgz#07f819d25ae48f87e538e6578b6964a4981a5609" @@ -7747,6 +8072,11 @@ lodash._getnative@^3.0.0: resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= +lodash._reinterpolate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" + integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= + lodash.assign@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" @@ -7812,6 +8142,11 @@ lodash.isequal@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= +lodash.ismatch@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37" + integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc= + lodash.isplainobject@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" @@ -7841,6 +8176,21 @@ lodash.sortby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= +lodash.template@^4.0.2: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" + integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A== + dependencies: + lodash._reinterpolate "^3.0.0" + lodash.templatesettings "^4.0.0" + +lodash.templatesettings@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33" + integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ== + dependencies: + lodash._reinterpolate "^3.0.0" + lodash.throttle@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4" @@ -8087,6 +8437,21 @@ meow@^3.1.0, meow@^3.3.0, meow@^3.7.0: redent "^1.0.0" trim-newlines "^1.0.0" +meow@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/meow/-/meow-4.0.1.tgz#d48598f6f4b1472f35bf6317a95945ace347f975" + integrity sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A== + dependencies: + camelcase-keys "^4.0.0" + decamelize-keys "^1.0.0" + loud-rejection "^1.0.0" + minimist "^1.1.3" + minimist-options "^3.0.1" + normalize-package-data "^2.3.4" + read-pkg-up "^3.0.0" + redent "^2.0.0" + trim-newlines "^2.0.0" + meow@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/meow/-/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4" @@ -8331,6 +8696,11 @@ modify-filename@^1.1.0: resolved "https://registry.yarnpkg.com/modify-filename/-/modify-filename-1.1.0.tgz#9a2dec83806fbb2d975f22beec859ca26b393aa1" integrity sha1-mi3sg4Bvuy2XXyK+7IWcoms5OqE= +modify-values@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" + integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw== + moo@^0.4.3: version "0.4.3" resolved "https://registry.yarnpkg.com/moo/-/moo-0.4.3.tgz#3f847a26f31cf625a956a87f2b10fbc013bfd10e" @@ -8658,7 +9028,7 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" -normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0: +normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== @@ -8775,6 +9145,11 @@ nugget@^2.0.0: single-line-log "^1.1.2" throttleit "0.0.2" +null-check@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd" + integrity sha1-l33/1xdgErnsMNKjnbXPcqBDnt0= + num2fraction@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" @@ -9059,6 +9434,13 @@ p-limit@^2.0.0: dependencies: p-try "^2.0.0" +p-limit@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537" + integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg== + dependencies: + p-try "^2.0.0" + p-locate@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" @@ -9073,6 +9455,13 @@ p-locate@^3.0.0: dependencies: p-limit "^2.0.0" +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + p-map@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b" @@ -9192,6 +9581,11 @@ parse-entities@^1.0.2, parse-entities@^1.1.0: is-decimal "^1.0.0" is-hexadecimal "^1.0.0" +parse-github-repo-url@^1.3.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50" + integrity sha1-nn2LslKmy2ukJZUGC3v23z28H1A= + parse-glob@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" @@ -9289,6 +9683,11 @@ path-exists@^3.0.0: resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -9380,7 +9779,7 @@ pidtree@^0.3.0: resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.0.tgz#f6fada10fccc9f99bf50e90d0b23d72c9ebc2e6b" integrity sha512-9CT4NFlDcosssyg8KVFltgokyKZIFjoBxw8CTGy+5F38Y1eQWrt8tRayiUOXE+zVKQnYu5BR8JjCtvK3BcnBhg== -pify@^2.0.0: +pify@^2.0.0, pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= @@ -10379,7 +10778,7 @@ pupa@^1.0.0: resolved "https://registry.yarnpkg.com/pupa/-/pupa-1.0.0.tgz#9a9568a5af7e657b8462a6e9d5328743560ceff6" integrity sha1-mpVopa9+ZXuEYqbp1TKHQ1YM7/Y= -q@^1.1.2: +q@^1.1.2, q@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= @@ -10833,7 +11232,7 @@ readable-stream@1.1.x, readable-stream@~1.1.9: isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@3, readable-stream@^3.0.6, readable-stream@^3.1.1: +"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1: version "3.4.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc" integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ== @@ -11609,7 +12008,7 @@ semver@5.6.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== -semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.2.0: +semver@6.3.0, semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.2.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== @@ -12282,6 +12681,20 @@ split-string@^3.0.1, split-string@^3.0.2: dependencies: extend-shallow "^3.0.0" +split2@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493" + integrity sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw== + dependencies: + through2 "^2.0.2" + +split@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9" + integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg== + dependencies: + through "2" + sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" @@ -12329,6 +12742,26 @@ stack-utils@^1.0.1: resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8" integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA== +standard-version@7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/standard-version/-/standard-version-7.0.0.tgz#4ce10ea5d20270ed4a32b22d15cce5fd1f1a5bbb" + integrity sha512-pbFXM9vutnxTkSGkqSWQeYCMYqWmFBaLUNdEc/sJDQnMgwB0Csw3CZeeDhi62VoVS3P8mQiYbvXGZWyOBWxUbw== + dependencies: + chalk "2.4.2" + conventional-changelog "3.1.9" + conventional-changelog-config-spec "2.0.0" + conventional-recommended-bump "6.0.0" + detect-indent "6.0.0" + detect-newline "3.0.0" + dotgitignore "2.1.0" + figures "3.0.0" + find-up "4.1.0" + fs-access "1.0.1" + git-semver-tags "3.0.0" + semver "6.3.0" + stringify-package "1.0.0" + yargs "13.3.0" + stat-mode@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502" @@ -12491,6 +12924,11 @@ stringify-entities@^1.0.1: is-alphanumerical "^1.0.0" is-hexadecimal "^1.0.0" +stringify-package@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.0.tgz#e02828089333d7d45cd8c287c30aa9a13375081b" + integrity sha512-JIQqiWmLiEozOC0b0BtxZ/AOUtdUZHCBPgqIZ2kSJJqGwgb9neo44XdTHUC4HZSGqi03hOeB7W/E8rAlKnGe9g== + strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" @@ -12890,6 +13328,11 @@ test-exclude@^4.2.1: read-pkg-up "^1.0.1" require-main-filename "^1.0.1" +text-extensions@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-2.0.0.tgz#43eabd1b495482fae4a2bf65e5f56c29f69220f6" + integrity sha512-F91ZqLgvi1E0PdvmxMgp+gcf6q8fMH7mhdwWfzXnl1k+GbpQDmi8l7DzLC5JTASKbwpY3TfxajAUzAXcv2NmsQ== + text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -12912,7 +13355,7 @@ throttleit@0.0.2: resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-0.0.2.tgz#cfedf88e60c00dd9697b61fdd2a8343a9b680eaf" integrity sha1-z+34jmDADdlpe2H90qg0OptoDq8= -through2@^2.0.0: +through2@^2.0.0, through2@^2.0.2: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== @@ -12920,6 +13363,13 @@ through2@^2.0.0: readable-stream "~2.3.6" xtend "~4.0.1" +through2@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a" + integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww== + dependencies: + readable-stream "2 || 3" + through2@~0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/through2/-/through2-0.2.3.tgz#eb3284da4ea311b6cc8ace3653748a52abf25a3f" @@ -12928,7 +13378,7 @@ through2@~0.2.3: readable-stream "~1.1.9" xtend "~2.1.1" -through@^2.3.6, through@~2.3.6: +through@2, "through@>=2.2.7 <3", through@^2.3.6, through@~2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= @@ -13125,6 +13575,11 @@ trim-newlines@^2.0.0: resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20" integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA= +trim-off-newlines@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3" + integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM= + trim-right@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" @@ -14094,7 +14549,7 @@ yargs-parser@^11.1.1: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^13.1.0: +yargs-parser@^13.1.0, yargs-parser@^13.1.1: version "13.1.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0" integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ== @@ -14147,6 +14602,22 @@ yargs@13.2.4: y18n "^4.0.0" yargs-parser "^13.1.0" +yargs@13.3.0: + version "13.3.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83" + integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA== + dependencies: + cliui "^5.0.0" + find-up "^3.0.0" + get-caller-file "^2.0.1" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^3.0.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^13.1.1" + yargs@6.6.0: version "6.6.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208" From 563423313c950587c377bdc84abaaefa878dc4e7 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Mon, 19 Aug 2019 19:08:52 +0200 Subject: [PATCH 53/81] fix --- .circleci/config.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 474ec85be..316a62206 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -84,8 +84,8 @@ jobs: key: v6-dependencies-mac-{{ checksum "package.json" }} paths: - node_modules - - : <<: *container_config + test: + <<: *container_config steps: - pre: sudo: 'sudo' @@ -139,8 +139,9 @@ workflows: build_mac: jobs: - build_mac - : jobs: - - + test: + jobs: + - test deploy: jobs: - deploy_win: From 5a0de5a669dcdd736ab28a00974504527afd36a5 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Mon, 19 Aug 2019 19:10:12 +0200 Subject: [PATCH 54/81] fix cache --- .circleci/config.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 316a62206..f7e16b1f7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,8 +37,8 @@ commands: - checkout - restore_cache: keys: - - v6-dependencies-{{ checksum "package.json" }} - - v6-dependencies- + - v7-dependencies-{{ checksum "package.json" }} + - v7-dependencies- - run: << parameters.sudo >> apt-get -y update - run: << parameters.sudo >> apt-get -y install libusb-1.0-0 @@ -56,7 +56,7 @@ jobs: sudo: 'sudo' - run: yarn dist --linux - save_cache: - key: v6-dependencies-{{ checksum "package.json" }} + key: v7-dependencies-{{ checksum "package.json" }} paths: - node_modules build_win: @@ -67,7 +67,7 @@ jobs: windows: true - run: yarn dist --win --x64 --ia32 - save_cache: - key: v6-dependencies-{{ checksum "package.json" }} + key: v7-dependencies-{{ checksum "package.json" }} paths: - node_modules build_mac: @@ -76,12 +76,12 @@ jobs: - checkout - restore_cache: keys: - - v6-dependencies-mac-{{ checksum "package.json" }} - - v6-dependencies-mac- + - v7-dependencies-mac-{{ checksum "package.json" }} + - v7-dependencies-mac- - run: yarn - run: yarn dist --mac - save_cache: - key: v6-dependencies-mac-{{ checksum "package.json" }} + key: v7-dependencies-mac-{{ checksum "package.json" }} paths: - node_modules test: @@ -120,8 +120,8 @@ jobs: - checkout - restore_cache: keys: - - v6-dependencies-mac-{{ checksum "package.json" }} - - v6-dependencies-mac- + - v7-dependencies-mac-{{ checksum "package.json" }} + - v7-dependencies-mac- - run: yarn - run: yarn release:mac - store_artifacts: From e6025ebf93d5a9454fe0eac13b6edcd809ad7f29 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Mon, 19 Aug 2019 19:17:53 +0200 Subject: [PATCH 55/81] cache test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f7e16b1f7..6ef07e6ff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,7 +25,7 @@ references: commands: pre: - description: 'Setting up and building environmentt' + description: 'Setting up and building environment' parameters: sudo: type: string From 2371512da98bf09d67208b31a8da1ef276a581ab Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Mon, 19 Aug 2019 19:28:19 +0200 Subject: [PATCH 56/81] store to workspace --- .circleci/config.yml | 78 +++++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 37 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ef07e6ff..b651a5a06 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -100,9 +100,9 @@ jobs: - pre: windows: true - run: yarn release:win - - store_artifacts: + - persist_to_workspace: + root: *workspace path: dist - destination: build deploy_linux: <<: *container_config @@ -110,9 +110,9 @@ jobs: - pre: sudo: 'sudo' - run: yarn release:linux - - store_artifacts: + - persist_to_workspace: + root: *workspace path: dist - destination: build deploy_mac: <<: *mac_config @@ -124,41 +124,45 @@ jobs: - v7-dependencies-mac- - run: yarn - run: yarn release:mac - - store_artifacts: + - persist_to_workspace: + root: *workspace path: dist - destination: build workflows: version: 2 - build_win: - jobs: - - build_win - build_linux: - jobs: - - build_linux - build_mac: - jobs: - - build_mac - test: - jobs: - - test - deploy: + temp: jobs: - - deploy_win: - filters: - branches: - ignore: /.*/ - tags: - only: /[v][0-9]+(\.[0-9]+)+.*/ - - deploy_linux: - filters: - branches: - ignore: /.*/ - tags: - only: /[v][0-9]+(\.[0-9]+)+.*/ - - deploy_mac: - filters: - branches: - ignore: /.*/ - tags: - only: /[v][0-9]+(\.[0-9]+)+.*/ + - deploy_linux + - deploy_mac + # build_win: + # jobs: + # - build_win + # build_linux: + # jobs: + # - build_linux + # build_mac: + # jobs: + # - build_mac + # test: + # jobs: + # - test + # deploy: + # jobs: + # - deploy_win: + # filters: + # branches: + # ignore: /.*/ + # tags: + # only: /[v][0-9]+(\.[0-9]+)+.*/ + # - deploy_linux: + # filters: + # branches: + # ignore: /.*/ + # tags: + # only: /[v][0-9]+(\.[0-9]+)+.*/ + # - deploy_mac: + # filters: + # branches: + # ignore: /.*/ + # tags: + # only: /[v][0-9]+(\.[0-9]+)+.*/ From c420cd238f38ab27aac67734d4f444c276c287df Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Mon, 19 Aug 2019 19:31:50 +0200 Subject: [PATCH 57/81] fix path --- .circleci/config.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b651a5a06..a05c7e107 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -110,9 +110,11 @@ jobs: - pre: sudo: 'sudo' - run: yarn release:linux + - run: pwd + - run: ls - persist_to_workspace: root: *workspace - path: dist + path: ./dist deploy_mac: <<: *mac_config @@ -126,7 +128,7 @@ jobs: - run: yarn release:mac - persist_to_workspace: root: *workspace - path: dist + path: ./dist workflows: version: 2 From 7485b4abeff020f015d29f97bc4537c35c778a9c Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Mon, 19 Aug 2019 19:35:48 +0200 Subject: [PATCH 58/81] fix path --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a05c7e107..3ee02f507 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -114,7 +114,8 @@ jobs: - run: ls - persist_to_workspace: root: *workspace - path: ./dist + paths: + - ./dist deploy_mac: <<: *mac_config From 436c22663a8907fc40a3182fac4a6ed780cd94ad Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Mon, 19 Aug 2019 19:41:21 +0200 Subject: [PATCH 59/81] add checksums job --- .circleci/config.yml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3ee02f507..4af353b23 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -102,7 +102,8 @@ jobs: - run: yarn release:win - persist_to_workspace: root: *workspace - path: dist + paths: + - ./dist deploy_linux: <<: *container_config @@ -115,7 +116,7 @@ jobs: - persist_to_workspace: root: *workspace paths: - - ./dist + - dist deploy_mac: <<: *mac_config @@ -129,7 +130,15 @@ jobs: - run: yarn release:mac - persist_to_workspace: root: *workspace - path: ./dist + paths: + - dist + + calculate_checksums: + <<: *container_config + steps: + - attach_workspace: + at: *workspace + - run: ls workflows: version: 2 @@ -137,6 +146,10 @@ workflows: jobs: - deploy_linux - deploy_mac + - calculate_checksums: + requires: + - deploy_linux + - deploy_mac # build_win: # jobs: # - build_win From f2a39eb9601d4a90c91cc40ad8a209729724c579 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Mon, 19 Aug 2019 19:49:13 +0200 Subject: [PATCH 60/81] test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4af353b23..b575b0731 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -129,7 +129,7 @@ jobs: - run: yarn - run: yarn release:mac - persist_to_workspace: - root: *workspace + root: *workspace/mac paths: - dist From 391c203b14565f0d4a7d23d0c0917a573e8be514 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Mon, 19 Aug 2019 19:51:02 +0200 Subject: [PATCH 61/81] fx --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b575b0731..f3fee7547 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -116,7 +116,7 @@ jobs: - persist_to_workspace: root: *workspace paths: - - dist + - dist/* deploy_mac: <<: *mac_config @@ -129,9 +129,9 @@ jobs: - run: yarn - run: yarn release:mac - persist_to_workspace: - root: *workspace/mac + root: *workspace paths: - - dist + - dist/* calculate_checksums: <<: *container_config From 03a8b9b17551ee68533c74006738900b0f7c8e84 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Mon, 19 Aug 2019 19:58:52 +0200 Subject: [PATCH 62/81] glob --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f3fee7547..dab9341d0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -116,7 +116,7 @@ jobs: - persist_to_workspace: root: *workspace paths: - - dist/* + - dist/*(.) deploy_mac: <<: *mac_config @@ -131,7 +131,7 @@ jobs: - persist_to_workspace: root: *workspace paths: - - dist/* + - dist/*(.) calculate_checksums: <<: *container_config From b46f6bc49af63233c354db69eb3befd5c4bfebc5 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Mon, 19 Aug 2019 20:35:08 +0200 Subject: [PATCH 63/81] glob2 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dab9341d0..7f05478df 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -116,7 +116,7 @@ jobs: - persist_to_workspace: root: *workspace paths: - - dist/*(.) + - dist/*.* deploy_mac: <<: *mac_config @@ -131,7 +131,7 @@ jobs: - persist_to_workspace: root: *workspace paths: - - dist/*(.) + - dist/*.* calculate_checksums: <<: *container_config From 87eb02d56842d45c87d67ed7b7cde1268239d2c2 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Mon, 19 Aug 2019 21:23:03 +0200 Subject: [PATCH 64/81] add checksum command --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7f05478df..620a80822 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -138,7 +138,8 @@ jobs: steps: - attach_workspace: at: *workspace - - run: ls + - run: ls ./dist + - run: shasum -a 256 ./dist/* workflows: version: 2 From 2100b57e1c911b094ce1aeba8e60565d70d23f40 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Tue, 20 Aug 2019 21:30:48 +0200 Subject: [PATCH 65/81] final test --- .circleci/config.yml | 74 ++++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 34 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 620a80822..f6919668f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -138,8 +138,8 @@ jobs: steps: - attach_workspace: at: *workspace - - run: ls ./dist - - run: shasum -a 256 ./dist/* + - run: cd ./dist + - run: shasum -a 256 ./* workflows: version: 2 @@ -151,35 +151,41 @@ workflows: requires: - deploy_linux - deploy_mac - # build_win: - # jobs: - # - build_win - # build_linux: - # jobs: - # - build_linux - # build_mac: - # jobs: - # - build_mac - # test: - # jobs: - # - test - # deploy: - # jobs: - # - deploy_win: - # filters: - # branches: - # ignore: /.*/ - # tags: - # only: /[v][0-9]+(\.[0-9]+)+.*/ - # - deploy_linux: - # filters: - # branches: - # ignore: /.*/ - # tags: - # only: /[v][0-9]+(\.[0-9]+)+.*/ - # - deploy_mac: - # filters: - # branches: - # ignore: /.*/ - # tags: - # only: /[v][0-9]+(\.[0-9]+)+.*/ + - deploy_windows + build_win: + jobs: + - build_win + build_linux: + jobs: + - build_linux + build_mac: + jobs: + - build_mac + test: + jobs: + - test + deploy: + jobs: + - sha_checksums: + requires: + - deploy_win + - deploy_linux + - deploy_mac + - deploy_win: + filters: + branches: + ignore: /.*/ + tags: + only: /[v][0-9]+(\.[0-9]+)+.*/ + - deploy_linux: + filters: + branches: + ignore: /.*/ + tags: + only: /[v][0-9]+(\.[0-9]+)+.*/ + - deploy_mac: + filters: + branches: + ignore: /.*/ + tags: + only: /[v][0-9]+(\.[0-9]+)+.*/ From 48510db6a6f697b7dc279ecc9ea81e9709490b17 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Tue, 20 Aug 2019 21:33:53 +0200 Subject: [PATCH 66/81] fix syntax --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f6919668f..0fbf006bd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -151,7 +151,7 @@ workflows: requires: - deploy_linux - deploy_mac - - deploy_windows + - deploy_win build_win: jobs: - build_win From c6c214922291ca880f30b53b0379fad5835646fb Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Tue, 20 Aug 2019 21:35:08 +0200 Subject: [PATCH 67/81] fix syntax --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0fbf006bd..6a03df2c2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -147,6 +147,7 @@ workflows: jobs: - deploy_linux - deploy_mac + - deploy_win - calculate_checksums: requires: - deploy_linux From 154c374ab3f28358eecde7e3be7c50eb61a78e69 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Tue, 20 Aug 2019 21:39:38 +0200 Subject: [PATCH 68/81] fix job name --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6a03df2c2..5b31ae92c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -167,7 +167,7 @@ workflows: - test deploy: jobs: - - sha_checksums: + - calculate_checksums: requires: - deploy_win - deploy_linux From 7d0e88cbba06e39a6f446d9ae645a845890fab85 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Tue, 20 Aug 2019 21:44:57 +0200 Subject: [PATCH 69/81] fix sha func --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b31ae92c..61c4b5d9f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -138,8 +138,7 @@ jobs: steps: - attach_workspace: at: *workspace - - run: cd ./dist - - run: shasum -a 256 ./* + - run: cd ./dist && shasum -a 256 ./* workflows: version: 2 From 257ea1bcd830387dcab3427d7b75241515026d3c Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Wed, 21 Aug 2019 16:36:46 +0200 Subject: [PATCH 70/81] fix win --- .circleci/config.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 61c4b5d9f..5238f4833 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,7 +62,7 @@ jobs: build_win: <<: *win_config steps: - - run: dpkg --add-architecture i386 # needed for 32-bit support + # - run: dpkg --add-architecture i386 # needed for 32-bit support - pre: windows: true - run: yarn dist --win --x64 --ia32 @@ -100,10 +100,11 @@ jobs: - pre: windows: true - run: yarn release:win + - run: ls ./dist - persist_to_workspace: root: *workspace paths: - - ./dist + - dist/*.* deploy_linux: <<: *container_config @@ -111,8 +112,7 @@ jobs: - pre: sudo: 'sudo' - run: yarn release:linux - - run: pwd - - run: ls + - run: ls ./dist - persist_to_workspace: root: *workspace paths: @@ -128,6 +128,7 @@ jobs: - v7-dependencies-mac- - run: yarn - run: yarn release:mac + - run: ls ./dist - persist_to_workspace: root: *workspace paths: @@ -155,15 +156,15 @@ workflows: build_win: jobs: - build_win - build_linux: - jobs: - - build_linux - build_mac: - jobs: - - build_mac - test: - jobs: - - test + # build_linux: + # jobs: + # - build_linux + # build_mac: + # jobs: + # - build_mac + # test: + # jobs: + # - test deploy: jobs: - calculate_checksums: From 05a5724938235661bdb73c899f9a111e5c16a1a5 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Wed, 21 Aug 2019 17:11:28 +0200 Subject: [PATCH 71/81] adjust shasum command --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5238f4833..8e2244528 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -139,7 +139,7 @@ jobs: steps: - attach_workspace: at: *workspace - - run: cd ./dist && shasum -a 256 ./* + - run: cd ./dist && shasum -a 256 *.* workflows: version: 2 From 7ac9861708add37c4453d3ab77c0af586ce9fc42 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Wed, 21 Aug 2019 17:18:31 +0200 Subject: [PATCH 72/81] fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8e2244528..0700b436a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -139,7 +139,7 @@ jobs: steps: - attach_workspace: at: *workspace - - run: cd ./dist && shasum -a 256 *.* + - run: cd ./dist && pwd && ls && shasum -a 256 *.* workflows: version: 2 From fe50dab21701c7e106080625f690a853131d5863 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Wed, 21 Aug 2019 17:27:34 +0200 Subject: [PATCH 73/81] fix --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0700b436a..8a8c8500d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -139,6 +139,7 @@ jobs: steps: - attach_workspace: at: *workspace + - run: pwd && ls - run: cd ./dist && pwd && ls && shasum -a 256 *.* workflows: From 73e6f837675a01cb8b9fef620be5947607f56353 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Wed, 21 Aug 2019 17:34:40 +0200 Subject: [PATCH 74/81] fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8a8c8500d..9538997fa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -132,7 +132,7 @@ jobs: - persist_to_workspace: root: *workspace paths: - - dist/*.* + - ./dist/*.* calculate_checksums: <<: *container_config From 0ea3e6d2aaa1990123c012ff0f5d5e1016550f9f Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Wed, 21 Aug 2019 17:54:17 +0200 Subject: [PATCH 75/81] test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9538997fa..c1d6d3dfb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -112,7 +112,6 @@ jobs: - pre: sudo: 'sudo' - run: yarn release:linux - - run: ls ./dist - persist_to_workspace: root: *workspace paths: @@ -129,6 +128,7 @@ jobs: - run: yarn - run: yarn release:mac - run: ls ./dist + - run: ls ./dist - persist_to_workspace: root: *workspace paths: From 8b40e097379506310619f1a5ccbc4ccc08e99bf7 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Wed, 21 Aug 2019 18:03:02 +0200 Subject: [PATCH 76/81] cleanup --- .circleci/config.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c1d6d3dfb..e7675da09 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -100,7 +100,6 @@ jobs: - pre: windows: true - run: yarn release:win - - run: ls ./dist - persist_to_workspace: root: *workspace paths: @@ -127,8 +126,6 @@ jobs: - v7-dependencies-mac- - run: yarn - run: yarn release:mac - - run: ls ./dist - - run: ls ./dist - persist_to_workspace: root: *workspace paths: @@ -139,8 +136,7 @@ jobs: steps: - attach_workspace: at: *workspace - - run: pwd && ls - - run: cd ./dist && pwd && ls && shasum -a 256 *.* + - run: cd ./dist && shasum -a 256 *.* workflows: version: 2 From a25da5f001126c6f5af545feafb1c7f1579e61e6 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Wed, 21 Aug 2019 18:15:33 +0200 Subject: [PATCH 77/81] cleanup --- .circleci/config.yml | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e7675da09..2b0b10464 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,7 +62,6 @@ jobs: build_win: <<: *win_config steps: - # - run: dpkg --add-architecture i386 # needed for 32-bit support - pre: windows: true - run: yarn dist --win --x64 --ia32 @@ -140,28 +139,18 @@ jobs: workflows: version: 2 - temp: - jobs: - - deploy_linux - - deploy_mac - - deploy_win - - calculate_checksums: - requires: - - deploy_linux - - deploy_mac - - deploy_win build_win: jobs: - build_win - # build_linux: - # jobs: - # - build_linux - # build_mac: - # jobs: - # - build_mac - # test: - # jobs: - # - test + build_linux: + jobs: + - build_linux + build_mac: + jobs: + - build_mac + test: + jobs: + - test deploy: jobs: - calculate_checksums: From 92716c5eafd5f04fba95c498a27412840a37977f Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Wed, 21 Aug 2019 18:34:45 +0200 Subject: [PATCH 78/81] adjust version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 96cb3a9b0..01c560cdd 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "repository": "https://www.github.com/nos/client", "author": "nOS", "homepage": "https://nos.io", - "version": "0.6.1", + "version": "0.6.0-rc.1", "private": true, "main": "dist/main/main.js", "license": "MIT", From f6f52353a42b2181f4279a6b6ffd6fd3f2544d70 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Wed, 21 Aug 2019 20:54:38 +0200 Subject: [PATCH 79/81] fix cache issue --- .circleci/config.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2b0b10464..7f98bf6e9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,8 +37,8 @@ commands: - checkout - restore_cache: keys: - - v7-dependencies-{{ checksum "package.json" }} - - v7-dependencies- + - v1-dependencies-{{ arch }}-{{ checksum "package.json" }} + - v1-dependencies-{{ arch }} - run: << parameters.sudo >> apt-get -y update - run: << parameters.sudo >> apt-get -y install libusb-1.0-0 @@ -56,7 +56,7 @@ jobs: sudo: 'sudo' - run: yarn dist --linux - save_cache: - key: v7-dependencies-{{ checksum "package.json" }} + key: v1-dependencies-{{ arch }}-{{ checksum "package.json" }} paths: - node_modules build_win: @@ -66,7 +66,7 @@ jobs: windows: true - run: yarn dist --win --x64 --ia32 - save_cache: - key: v7-dependencies-{{ checksum "package.json" }} + key: v1-dependencies-{{ arch }}-{{ checksum "package.json" }} paths: - node_modules build_mac: @@ -75,12 +75,12 @@ jobs: - checkout - restore_cache: keys: - - v7-dependencies-mac-{{ checksum "package.json" }} - - v7-dependencies-mac- + - v1-dependencies-{{ arch }}-{{ checksum "package.json" }} + - v1-dependencies-{{ arch }} - run: yarn - run: yarn dist --mac - save_cache: - key: v7-dependencies-mac-{{ checksum "package.json" }} + key: v1-dependencies-{{ arch }}-{{ checksum "package.json" }} paths: - node_modules test: @@ -121,8 +121,8 @@ jobs: - checkout - restore_cache: keys: - - v7-dependencies-mac-{{ checksum "package.json" }} - - v7-dependencies-mac- + - v1-dependencies-{{ arch }}-{{ checksum "package.json" }} + - v1-dependencies-{{ arch }} - run: yarn - run: yarn release:mac - persist_to_workspace: From fcaeecdc6e1bc13fe358e838aa20b07d64323620 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Wed, 21 Aug 2019 21:08:07 +0200 Subject: [PATCH 80/81] adjust job --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7f98bf6e9..571f60fc9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -148,7 +148,7 @@ workflows: build_mac: jobs: - build_mac - test: + unit_tests: jobs: - test deploy: From 0caff039255b0e8457d1c6aaabbe146d01aeef34 Mon Sep 17 00:00:00 2001 From: Maurice Dalderup Date: Wed, 21 Aug 2019 21:14:58 +0200 Subject: [PATCH 81/81] remove redundant command --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 571f60fc9..f8598eea8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -88,7 +88,6 @@ jobs: steps: - pre: sudo: 'sudo' - - run: yarn - run: yarn codecov - codecov/upload: file: ./coverage/lcov.info