From 60f56d49b082e20711bcb262ce4ea053ac2c9699 Mon Sep 17 00:00:00 2001 From: Maxim Kovalov Date: Mon, 19 Oct 2020 13:35:37 +0300 Subject: [PATCH 01/11] feat(circleci): add windows build --- .circleci/config.yml | 66 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 60 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c40fa3c2a..8bcf3ef05 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,4 @@ -version: 2 +version: 2.1 aliases: - &cache_version '2' - &step_prepare_cache_buster @@ -45,7 +45,8 @@ aliases: run: name: Upgrade Yarn command: npm install -g yarn@latest - +orbs: + win: circleci/windows@2.2.0 jobs: 'unit-test': docker: &DOCKERIMAGE @@ -155,6 +156,30 @@ jobs: - store_artifacts: path: dist/{latest,SelfKey Identity,selfkey-identity}* - *step_save_cache_mac + 'build-windows': + executor: win/default + environment: + OSENV: windows + NO_PROXY: 127.0.0.1,localhost + steps: + - checkout + - run: Write-Host 'Hello, Windows' + 'stage-windows': + executor: win/default + environment: + OSENV: windows + NO_PROXY: 127.0.0.1,localhost + steps: + - checkout + - run: Write-Host 'Hello, Windows' + 'publish-windows': + executor: win/default + environment: + OSENV: windows + NO_PROXY: 127.0.0.1,localhost + steps: + - checkout + - run: Write-Host 'Hello, Windows' 'build-linux': docker: *DOCKERIMAGE environment: @@ -422,9 +447,10 @@ workflows: branches: ignore: - auto-update-test + # - 'e2e-linux': - # requires: - # - build-linux + # requires: + # - build-linux - 'stage-linux': requires: # - e2e-linux @@ -437,6 +463,26 @@ workflows: - nightly - release - /staging.*/ + - 'build-windows': + requires: + - unit-test + filters: + branches: + ignore: + - auto-update-test + - 'stage-windows': + requires: + # - e2e-linux + - build-windows + # - build-linux-arm + filters: + branches: + only: + - dev + - nightly + - release + - /staging.*/ + - 'build-mac': requires: - unit-test @@ -445,8 +491,8 @@ workflows: ignore: - auto-update-test # - 'e2e-mac': - # requires: - # - build-mac + # requires: + # - build-mac - 'stage-mac': requires: # - e2e-mac @@ -487,3 +533,11 @@ workflows: branches: only: - master + - 'publish-windows': + requires: + # - e2e-linux + - build-windows + filters: + branches: + only: + - master From 01281bfa98bf6a4a25ab45072c28ce731833992a Mon Sep 17 00:00:00 2001 From: Maxim Kovalov Date: Mon, 19 Oct 2020 14:14:10 +0300 Subject: [PATCH 02/11] feat: test build --- .circleci/config.yml | 1075 ++++++++++++++++++++++-------------------- .prettierrc.json | 11 +- 2 files changed, 563 insertions(+), 523 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8bcf3ef05..a2e81d3bd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,543 +1,574 @@ version: 2.1 aliases: - - &cache_version '2' - - &step_prepare_cache_buster - run: - name: Prepare Cache Buster - command: echo ${CACHE_VERSION} > /tmp/cache_buster - - &step_setup_nvm - run: - name: Setup NVM + - &cache_version '2' + - &step_prepare_cache_buster + run: + name: Prepare Cache Buster + command: echo ${CACHE_VERSION} > /tmp/cache_buster + - &step_setup_nvm + run: + name: Setup NVM + command: | + export NODE_VERSION=$(cat .nvmrc) + curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash -s -- --no-use + echo 'export NVM_DIR=$HOME/.nvm' >> $BASH_ENV + echo 'source $NVM_DIR/nvm.sh' >> $BASH_ENV + - &step_restore_cache_mac + restore_cache: + name: Restore Yarn Package Cache + keys: + - yarn-packages-mac-{{ checksum "/tmp/cache_buster" }}-{{ .Branch }}-{{ checksum "yarn.lock" }} + - yarn-packages-mac-{{ checksum "/tmp/cache_buster" }}-{{ .Branch }}- + - yarn-packages-mac-{{ checksum "/tmp/cache_buster" }}}-dev + - yarn-packages-mac-{{ checksum "/tmp/cache_buster" }}}- + - &step_save_cache_mac + save_cache: + name: Save Yarn Package Cache + key: yarn-packages-mac-{{ checksum "/tmp/cache_buster" }}-{{ .Branch }}-{{ checksum "yarn.lock" }} + paths: + - node_modules/ + - &step_restore_cache + restore_cache: + name: Restore Yarn Package Cache + keys: + - yarn-packages-{{ checksum "/tmp/cache_buster" }}-{{ .Branch }}-{{ checksum "yarn.lock" }} + - yarn-packages-{{ checksum "/tmp/cache_buster" }}-{{ .Branch }}- + - yarn-packages-{{ checksum "/tmp/cache_buster" }}-dev + - yarn-packages-{{ checksum "/tmp/cache_buster" }}- + - &step_save_cache + save_cache: + name: Save Yarn Package Cache + key: yarn-packages-{{ checksum "/tmp/cache_buster" }}-{{ .Branch }}-{{ checksum "yarn.lock" }} + paths: + - node_modules/ + - &step_yarn_upgrade + run: + name: Upgrade Yarn + command: npm install -g yarn@latest +orbs: + win: circleci/windows@2.2.0 +jobs: + 'unit-test': + docker: &DOCKERIMAGE + - image: circleci/node:10.13.0-stretch-browsers + environment: + CACHE_VERSION: *cache_version + JEST_JUNIT_OUTPUT_DIR: dist/junit + JEST_JUNIT_UNIQUE_OUTPUT_NAME: 'true' + parallelism: 4 + steps: + - checkout + - attach_workspace: + at: /tmp/linux + - *step_prepare_cache_buster + - *step_restore_cache + - run: + name: Install OS Dependecies command: | - export NODE_VERSION=$(cat .nvmrc) - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash -s -- --no-use - echo 'export NVM_DIR=$HOME/.nvm' >> $BASH_ENV - echo 'source $NVM_DIR/nvm.sh' >> $BASH_ENV - - &step_restore_cache_mac - restore_cache: - name: Restore Yarn Package Cache - keys: - - yarn-packages-mac-{{ checksum "/tmp/cache_buster" }}-{{ .Branch }}-{{ checksum "yarn.lock" }} - - yarn-packages-mac-{{ checksum "/tmp/cache_buster" }}-{{ .Branch }}- - - yarn-packages-mac-{{ checksum "/tmp/cache_buster" }}}-dev - - yarn-packages-mac-{{ checksum "/tmp/cache_buster" }}}- - - &step_save_cache_mac - save_cache: - name: Save Yarn Package Cache - key: yarn-packages-mac-{{ checksum "/tmp/cache_buster" }}-{{ .Branch }}-{{ checksum "yarn.lock" }} + sudo apt-get update + sudo apt-get install build-essential + sudo apt-get install libusb-1.0-0 libusb-1.0-0-dev libudev-dev + - run: + name: Install Node Packages + command: yarn install-all + - run: + name: Unit Tests + command: | + TESTFILES=$(circleci tests glob "src/**/*.{spec,test}.js" | circleci tests split) + echo "This job runs the following tests:" + echo circleci tests glob "src/**/*.{spec,test}.js" | circleci tests split | xargs -n 1 echo + yarn test:unit:ci $TESTFILES + - run: + name: Coveralls + command: yarn coveralls + - store_test_results: + path: dist/junit + - store_artifacts: + path: dist + - *step_save_cache + 'build-storybook': + docker: *DOCKERIMAGE + environment: + CACHE_VERSION: *cache_version + NODE_OPTIONS: --max_old_space_size=4096 + steps: + - checkout + - attach_workspace: + at: /tmp/linux + - *step_prepare_cache_buster + - *step_restore_cache + - run: + name: Build Storybook + command: yarn build-storybook + - persist_to_workspace: + root: . paths: - - node_modules/ - - &step_restore_cache - restore_cache: + - dist + 'publish-storybook': + docker: *DOCKERIMAGE + environment: + CACHE_VERSION: *cache_version + steps: + - checkout + - attach_workspace: + at: /tmp/linux + - *step_prepare_cache_buster + - *step_restore_cache + - run: + name: Get storybook from attach_workspace + command: | + mkdir -p dist + cp -r /tmp/linux/dist/storybook dist/storybook + - run: + name: Story book + command: yarn deploy-storybook-ci + + 'build-mac': + macos: + xcode: '11.7.0' + environment: + CACHE_VERSION: *cache_version + steps: + - checkout + - attach_workspace: + at: /tmp/mac + - *step_prepare_cache_buster + - *step_restore_cache_mac + - *step_setup_nvm + - *step_yarn_upgrade + - run: + name: Add Read Access to yarn config + command: | + sudo mkdir -p ~/.config + sudo chown -R $USER:$GROUP ~/.config + + - run: + name: Install Node Packages + command: yarn install-all + no_output_timeout: 30m + + - run: + name: Set Sentry + command: echo {\"dsn\":\"${SENTRY_DSN}\"} > src/main/assets/data/sentry.json + - run: + name: Build App + command: yarn dist --publish=never + no_output_timeout: 80m + - persist_to_workspace: + root: . + paths: + - dist + - store_artifacts: + path: dist/{latest,SelfKey Identity,selfkey-identity}* + - *step_save_cache_mac + 'build-windows': + executor: win/default + environment: + OSENV: windows + NO_PROXY: 127.0.0.1,localhost + DEBUG: electron-builder + steps: + - checkout + - restore_cache: name: Restore Yarn Package Cache keys: - - yarn-packages-{{ checksum "/tmp/cache_buster" }}-{{ .Branch }}-{{ checksum "yarn.lock" }} - - yarn-packages-{{ checksum "/tmp/cache_buster" }}-{{ .Branch }}- - - yarn-packages-{{ checksum "/tmp/cache_buster" }}-dev - - yarn-packages-{{ checksum "/tmp/cache_buster" }}- - - &step_save_cache - save_cache: + - yarn-packages-win-{{ .Branch }}-{{ checksum "yarn.lock" }} + - yarn-packages-win-{{ .Branch }}- + - yarn-packages-win-dev- + - yarn-packages-win- + - run: tzutil /s "UTC" + - run: git config --global core.autocrlf input + - run: Start-FileDownload 'https://storage.googleapis.com/win-open-ssl/Win64OpenSSL-1_0_2r.exe' + - run: Start-Process 'Win64OpenSSL-1_0_2r.exe' -ArgumentList '/silent /verysilent /sp- /suppressmsgboxes' -Wait + - run: Start-Process 'GoogleCloudSDKInstaller.exe' -ArgumentList '/S' -Wait + - run: refreshenv + - run: Install-Product node $env:nodejs_version x64 + - run: npm i -g yarn + - run: yarn install-all + - run: npm config set msvs_version 2015 --global + - run: echo {"dsn":"%SENTRY_DSN%"} > src\assets\data\sentry.json + - run: yarn dist --publish=never + - store_artifacts: + path: dist/*.exe + - save_cache: name: Save Yarn Package Cache - key: yarn-packages-{{ checksum "/tmp/cache_buster" }}-{{ .Branch }}-{{ checksum "yarn.lock" }} + key: yarn-packages-win-{{ .Branch }}-{{ checksum "yarn.lock" }} paths: - - node_modules/ - - &step_yarn_upgrade - run: - name: Upgrade Yarn - command: npm install -g yarn@latest -orbs: - win: circleci/windows@2.2.0 -jobs: - 'unit-test': - docker: &DOCKERIMAGE - - image: circleci/node:10.13.0-stretch-browsers - environment: - CACHE_VERSION: *cache_version - JEST_JUNIT_OUTPUT_DIR: dist/junit - JEST_JUNIT_UNIQUE_OUTPUT_NAME: 'true' - steps: - - checkout - - attach_workspace: - at: /tmp/linux - - *step_prepare_cache_buster - - *step_restore_cache - - run: - name: Install OS Dependecies - command: | - sudo apt-get update - sudo apt-get install build-essential - sudo apt-get install libusb-1.0-0 libusb-1.0-0-dev libudev-dev - - run: - name: Install Node Packages - command: yarn install-all - - run: - name: Unit Tests - command: yarn test:unit:ci - - run: - name: Coveralls - command: yarn coveralls - - store_test_results: - path: dist/junit - - store_artifacts: - path: dist - - *step_save_cache - 'build-storybook': - docker: *DOCKERIMAGE - environment: - CACHE_VERSION: *cache_version - NODE_OPTIONS: --max_old_space_size=4096 - steps: - - checkout - - attach_workspace: - at: /tmp/linux - - *step_prepare_cache_buster - - *step_restore_cache - - run: - name: Build Storybook - command: yarn build-storybook - - persist_to_workspace: - root: . - paths: - - dist - 'publish-storybook': - docker: *DOCKERIMAGE - environment: - CACHE_VERSION: *cache_version - steps: - - checkout - - attach_workspace: - at: /tmp/linux - - *step_prepare_cache_buster - - *step_restore_cache - - run: - name: Get storybook from attach_workspace - command: | - mkdir -p dist - cp -r /tmp/linux/dist/storybook dist/storybook - - run: - name: Story book - command: yarn deploy-storybook-ci - - 'build-mac': - macos: - xcode: '11.7.0' - environment: - CACHE_VERSION: *cache_version - steps: - - checkout - - attach_workspace: - at: /tmp/mac - - *step_prepare_cache_buster - - *step_restore_cache_mac - - *step_setup_nvm - - *step_yarn_upgrade - - run: - name: Add Read Access to yarn config - command: | - sudo mkdir -p ~/.config - sudo chown -R $USER:$GROUP ~/.config - - - run: - name: Install Node Packages - command: yarn install-all - no_output_timeout: 30m - - - run: - name: Set Sentry - command: echo {\"dsn\":\"${SENTRY_DSN}\"} > src/main/assets/data/sentry.json - - run: - name: Build App - command: yarn dist --publish=never - no_output_timeout: 80m - - persist_to_workspace: - root: . - paths: - - dist - - store_artifacts: - path: dist/{latest,SelfKey Identity,selfkey-identity}* - - *step_save_cache_mac - 'build-windows': - executor: win/default - environment: - OSENV: windows - NO_PROXY: 127.0.0.1,localhost - steps: - - checkout - - run: Write-Host 'Hello, Windows' - 'stage-windows': - executor: win/default - environment: - OSENV: windows - NO_PROXY: 127.0.0.1,localhost - steps: - - checkout - - run: Write-Host 'Hello, Windows' - 'publish-windows': - executor: win/default - environment: - OSENV: windows - NO_PROXY: 127.0.0.1,localhost - steps: - - checkout - - run: Write-Host 'Hello, Windows' - 'build-linux': - docker: *DOCKERIMAGE - environment: - CACHE_VERSION: *cache_version - steps: - - checkout - - attach_workspace: - at: /tmp/linux - - *step_prepare_cache_buster - - *step_restore_cache - - run: - name: Install OS Dependecies - command: | - sudo apt-get update - sudo apt-get install libudev-dev - sudo apt-get install libusb-1.0-0 libusb-1.0-0-dev libudev-dev - sudo apt-get install libc6-dev-armhf-cross linux-libc-dev-armhf-cross g++-arm-linux-gnueabihf - - run: - name: Install Node Packages - command: yarn install-all - - run: - name: Set Sentry - command: echo {\"dsn\":\"${SENTRY_DSN}\"} > src/main/assets/data/sentry.json - - run: - name: Build App - command: yarn dist --publish=never - - persist_to_workspace: - root: . - paths: - - dist - - store_artifacts: - path: dist/{latest,SelfKey Identity,selfkey-identity}* - - *step_save_cache - 'e2e-mac': - macos: - xcode: '11.7.0' - environment: - CACHE_VERSION: *cache_version - steps: - - checkout - - attach_workspace: - at: /tmp/mac - - *step_prepare_cache_buster - - *step_restore_cache_mac - - *step_setup_nvm - - *step_yarn_upgrade - - run: - name: Add Read Access to yarn config - command: | - sudo mkdir -p ~/.config - sudo chown -R $USER:$GROUP ~/.config - - run: - name: E2E Tests - command: OSENV=circle-mac yarn test:e2e + - node_modules\ + 'stage-windows': + executor: win/default + environment: + OSENV: windows + NO_PROXY: 127.0.0.1,localhost + steps: + - checkout + - run: Write-Host 'Hello, Windows' + 'publish-windows': + executor: win/default + environment: + OSENV: windows + NO_PROXY: 127.0.0.1,localhost + steps: + - checkout + - run: Write-Host 'Hello, Windows' + 'build-linux': + docker: *DOCKERIMAGE + environment: + CACHE_VERSION: *cache_version + steps: + - checkout + - attach_workspace: + at: /tmp/linux + - *step_prepare_cache_buster + - *step_restore_cache + - run: + name: Install OS Dependecies + command: | + sudo apt-get update + sudo apt-get install libudev-dev + sudo apt-get install libusb-1.0-0 libusb-1.0-0-dev libudev-dev + sudo apt-get install libc6-dev-armhf-cross linux-libc-dev-armhf-cross g++-arm-linux-gnueabihf + - run: + name: Install Node Packages + command: yarn install-all + - run: + name: Set Sentry + command: echo {\"dsn\":\"${SENTRY_DSN}\"} > src/main/assets/data/sentry.json + - run: + name: Build App + command: yarn dist --publish=never + - persist_to_workspace: + root: . + paths: + - dist + - store_artifacts: + path: dist/{latest,SelfKey Identity,selfkey-identity}* + - *step_save_cache + 'e2e-mac': + macos: + xcode: '11.7.0' + environment: + CACHE_VERSION: *cache_version + steps: + - checkout + - attach_workspace: + at: /tmp/mac + - *step_prepare_cache_buster + - *step_restore_cache_mac + - *step_setup_nvm + - *step_yarn_upgrade + - run: + name: Add Read Access to yarn config + command: | + sudo mkdir -p ~/.config + sudo chown -R $USER:$GROUP ~/.config + - run: + name: E2E Tests + command: OSENV=circle-mac yarn test:e2e - 'e2e-linux': - docker: *DOCKERIMAGE - environment: - CACHE_VERSION: *cache_version - steps: - - checkout - - attach_workspace: - at: /tmp/linux - - *step_prepare_cache_buster - - *step_restore_cache - - *step_setup_nvm - - *step_yarn_upgrade - - run: - name: E2E Tests - command: OSENV=circle-linux yarn test:e2e + 'e2e-linux': + docker: *DOCKERIMAGE + environment: + CACHE_VERSION: *cache_version + steps: + - checkout + - attach_workspace: + at: /tmp/linux + - *step_prepare_cache_buster + - *step_restore_cache + - *step_setup_nvm + - *step_yarn_upgrade + - run: + name: E2E Tests + command: OSENV=circle-linux yarn test:e2e - 'stage-mac': - docker: &GGLOUDIMAGE - - image: google/cloud-sdk:latest - steps: - - checkout - - attach_workspace: - at: /tmp/mac - - run: - name: Deploy mac to staging - command: bash deploy.sh "$(git log --format=%B -n 1 $CIRCLE_SHA1)" - environment: - OSENV: mac + 'stage-mac': + docker: &GGLOUDIMAGE + - image: google/cloud-sdk:latest + steps: + - checkout + - attach_workspace: + at: /tmp/mac + - run: + name: Deploy mac to staging + command: bash deploy.sh "$(git log --format=%B -n 1 $CIRCLE_SHA1)" + environment: + OSENV: mac - 'stage-linux': - docker: &GGLOUDIMAGE - - image: google/cloud-sdk:latest - steps: - - checkout - - attach_workspace: - at: /tmp/linux - - run: - name: Deploy linux to staging - command: bash deploy.sh "$(git log --format=%B -n 1 $CIRCLE_SHA1)" - environment: - OSENV: linux + 'stage-linux': + docker: &GGLOUDIMAGE + - image: google/cloud-sdk:latest + steps: + - checkout + - attach_workspace: + at: /tmp/linux + - run: + name: Deploy linux to staging + command: bash deploy.sh "$(git log --format=%B -n 1 $CIRCLE_SHA1)" + environment: + OSENV: linux - 'publish-mac': - macos: - xcode: '11.7.0' - environment: - CACHE_VERSION: *cache_version - steps: - - checkout - - attach_workspace: - at: /tmp/mac - - *step_prepare_cache_buster - - *step_restore_cache_mac - - *step_setup_nvm - - *step_yarn_upgrade - - run: - name: Set Sentry - command: echo {\"dsn\":\"${SENTRY_DSN}\"} > src/main/assets/data/sentry.json - - run: - name: Publish App to Github - command: yarn publish-build - no_output_timeout: 1h + 'publish-mac': + macos: + xcode: '11.7.0' + environment: + CACHE_VERSION: *cache_version + steps: + - checkout + - attach_workspace: + at: /tmp/mac + - *step_prepare_cache_buster + - *step_restore_cache_mac + - *step_setup_nvm + - *step_yarn_upgrade + - run: + name: Set Sentry + command: echo {\"dsn\":\"${SENTRY_DSN}\"} > src/main/assets/data/sentry.json + - run: + name: Publish App to Github + command: yarn publish-build + no_output_timeout: 1h - 'publish-linux': - docker: *DOCKERIMAGE - environment: - CACHE_VERSION: *cache_version - steps: - - checkout - - attach_workspace: - at: /tmp/linux - - *step_prepare_cache_buster - - *step_restore_cache - - *step_setup_nvm - - *step_yarn_upgrade - - run: - name: Install OS Dependecies - command: | - sudo apt-get update - sudo apt-get install build-essential - sudo apt-get install libusb-1.0-0 libusb-1.0-0-dev libudev-dev - - run: - name: Install Node Packages - command: yarn install-all - - run: - name: Set Sentry - command: echo {\"dsn\":\"${SENTRY_DSN}\"} > src/main/assets/data/sentry.json - - run: - name: Publish App to Github - command: yarn publish-build + 'publish-linux': + docker: *DOCKERIMAGE + environment: + CACHE_VERSION: *cache_version + steps: + - checkout + - attach_workspace: + at: /tmp/linux + - *step_prepare_cache_buster + - *step_restore_cache + - *step_setup_nvm + - *step_yarn_upgrade + - run: + name: Install OS Dependecies + command: | + sudo apt-get update + sudo apt-get install build-essential + sudo apt-get install libusb-1.0-0 libusb-1.0-0-dev libudev-dev + - run: + name: Install Node Packages + command: yarn install-all + - run: + name: Set Sentry + command: echo {\"dsn\":\"${SENTRY_DSN}\"} > src/main/assets/data/sentry.json + - run: + name: Publish App to Github + command: yarn publish-build - 'mac-prepare-auto-update-test': - macos: - xcode: '11.7.0' - environment: - CACHE_VERSION: *cache_version - steps: - - checkout - - attach_workspace: - at: /tmp/mac - - *step_prepare_cache_buster - - *step_restore_cache_mac - - *step_setup_nvm - - *step_yarn_upgrade - - run: - name: Add Read Access to yarn config - command: | - sudo mkdir -p ~/.config - sudo chown -R $USER:$GROUP ~/.config + 'mac-prepare-auto-update-test': + macos: + xcode: '11.7.0' + environment: + CACHE_VERSION: *cache_version + steps: + - checkout + - attach_workspace: + at: /tmp/mac + - *step_prepare_cache_buster + - *step_restore_cache_mac + - *step_setup_nvm + - *step_yarn_upgrade + - run: + name: Add Read Access to yarn config + command: | + sudo mkdir -p ~/.config + sudo chown -R $USER:$GROUP ~/.config - - run: - name: Install Node Packages - command: yarn install-all - no_output_timeout: 30m + - run: + name: Install Node Packages + command: yarn install-all + no_output_timeout: 30m - - run: - name: Set Sentry - command: echo {\"dsn\":\"${SENTRY_DSN}\"} > src/main/assets/data/sentry.json - - run: - name: Bump auto update version - command: yarn auto-update-version - - run: - name: Build App - command: NOTARIZE=1 yarn dist --publish=never - no_output_timeout: 80m - - persist_to_workspace: - root: . - paths: - - dist - - store_artifacts: - path: dist/{latest,SelfKey Identity,selfkey-identity}* - - *step_save_cache_mac - 'linux-prepare-auto-update-test': - docker: *DOCKERIMAGE - environment: - CACHE_VERSION: *cache_version - steps: - - checkout - - attach_workspace: - at: /tmp/linux - - *step_prepare_cache_buster - - *step_restore_cache - - run: - name: Install OS Dependecies - command: | - sudo apt-get update - sudo apt-get install libudev-dev - sudo apt-get install libusb-1.0-0 libusb-1.0-0-dev libudev-dev - sudo apt-get install libc6-dev-armhf-cross linux-libc-dev-armhf-cross g++-arm-linux-gnueabihf - - run: - name: Install Node Packages - command: yarn install-all - - run: - name: Set Sentry - command: echo {\"dsn\":\"${SENTRY_DSN}\"} > src/main/assets/data/sentry.json - - run: - name: Bump auto update version - command: yarn auto-update-version - - run: - name: Build App - command: yarn dist --publish=never - - persist_to_workspace: - root: . - paths: - - dist - - store_artifacts: - path: dist/{latest,SelfKey Identity,selfkey-identity}* - - *step_save_cache + - run: + name: Set Sentry + command: echo {\"dsn\":\"${SENTRY_DSN}\"} > src/main/assets/data/sentry.json + - run: + name: Bump auto update version + command: yarn auto-update-version + - run: + name: Build App + command: NOTARIZE=1 yarn dist --publish=never + no_output_timeout: 80m + - persist_to_workspace: + root: . + paths: + - dist + - store_artifacts: + path: dist/{latest,SelfKey Identity,selfkey-identity}* + - *step_save_cache_mac + 'linux-prepare-auto-update-test': + docker: *DOCKERIMAGE + environment: + CACHE_VERSION: *cache_version + steps: + - checkout + - attach_workspace: + at: /tmp/linux + - *step_prepare_cache_buster + - *step_restore_cache + - run: + name: Install OS Dependecies + command: | + sudo apt-get update + sudo apt-get install libudev-dev + sudo apt-get install libusb-1.0-0 libusb-1.0-0-dev libudev-dev + sudo apt-get install libc6-dev-armhf-cross linux-libc-dev-armhf-cross g++-arm-linux-gnueabihf + - run: + name: Install Node Packages + command: yarn install-all + - run: + name: Set Sentry + command: echo {\"dsn\":\"${SENTRY_DSN}\"} > src/main/assets/data/sentry.json + - run: + name: Bump auto update version + command: yarn auto-update-version + - run: + name: Build App + command: yarn dist --publish=never + - persist_to_workspace: + root: . + paths: + - dist + - store_artifacts: + path: dist/{latest,SelfKey Identity,selfkey-identity}* + - *step_save_cache workflows: - version: 2 - auto-update-test: - jobs: - - 'mac-prepare-auto-update-test': - filters: - branches: - only: - - auto-update-test - - 'stage-mac': - requires: - - mac-prepare-auto-update-test - filters: - branches: - only: - - auto-update-test - - 'linux-prepare-auto-update-test': - filters: - branches: - only: - - auto-update-test - - 'stage-linux': - requires: - - linux-prepare-auto-update-test - filters: - branches: - only: - - auto-update-test + version: 2 + auto-update-test: + jobs: + - 'mac-prepare-auto-update-test': + filters: + branches: + only: + - auto-update-test + - 'stage-mac': + requires: + - mac-prepare-auto-update-test + filters: + branches: + only: + - auto-update-test + - 'linux-prepare-auto-update-test': + filters: + branches: + only: + - auto-update-test + - 'stage-linux': + requires: + - linux-prepare-auto-update-test + filters: + branches: + only: + - auto-update-test - main: - jobs: - - 'unit-test': - filters: - branches: - ignore: - - auto-update-test - - 'build-linux': - requires: - - unit-test - filters: - branches: - ignore: - - auto-update-test + main: + jobs: + - 'unit-test': + filters: + branches: + ignore: + - auto-update-test + - 'build-linux': + requires: + - unit-test + filters: + branches: + ignore: + - auto-update-test - # - 'e2e-linux': - # requires: - # - build-linux - - 'stage-linux': - requires: - # - e2e-linux - - build-linux - # - build-linux-arm - filters: - branches: - only: - - dev - - nightly - - release - - /staging.*/ - - 'build-windows': - requires: - - unit-test - filters: - branches: - ignore: - - auto-update-test - - 'stage-windows': - requires: - # - e2e-linux - - build-windows - # - build-linux-arm - filters: - branches: - only: - - dev - - nightly - - release - - /staging.*/ + # - 'e2e-linux': + # requires: + # - build-linux + - 'stage-linux': + requires: + # - e2e-linux + - build-linux + # - build-linux-arm + filters: + branches: + only: + - dev + - nightly + - release + - /staging.*/ + - 'build-windows': + requires: + - unit-test + filters: + branches: + ignore: + - auto-update-test + - 'stage-windows': + requires: + # - e2e-linux + - build-windows + # - build-linux-arm + filters: + branches: + only: + - dev + - nightly + - release + - /staging.*/ - - 'build-mac': - requires: - - unit-test - filters: - branches: - ignore: - - auto-update-test - # - 'e2e-mac': - # requires: - # - build-mac - - 'stage-mac': - requires: - # - e2e-mac - - build-mac - filters: - branches: - only: - - dev - - nightly - - release - - /staging.*/ - - 'build-storybook': - requires: - - unit-test - filters: - branches: - only: - - dev - - 'publish-storybook': - requires: - - build-storybook - filters: - branches: - only: - - dev - - 'publish-mac': - requires: - - build-mac - filters: - branches: - only: - - master - - 'publish-linux': - requires: - # - e2e-linux - - build-linux - filters: - branches: - only: - - master - - 'publish-windows': - requires: - # - e2e-linux - - build-windows - filters: - branches: - only: - - master + - 'build-mac': + requires: + - unit-test + filters: + branches: + ignore: + - auto-update-test + # - 'e2e-mac': + # requires: + # - build-mac + - 'stage-mac': + requires: + # - e2e-mac + - build-mac + filters: + branches: + only: + - dev + - nightly + - release + - /staging.*/ + - 'build-storybook': + requires: + - unit-test + filters: + branches: + only: + - dev + - 'publish-storybook': + requires: + - build-storybook + filters: + branches: + only: + - dev + - 'publish-mac': + requires: + - build-mac + filters: + branches: + only: + - master + - 'publish-linux': + requires: + # - e2e-linux + - build-linux + filters: + branches: + only: + - master + - 'publish-windows': + requires: + # - e2e-linux + - build-windows + filters: + branches: + only: + - master diff --git a/.prettierrc.json b/.prettierrc.json index 93362fa72..57084b99c 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -7,5 +7,14 @@ "trailingComma": "none", "bracketSpacing": true, "arrowParens": "avoid", - "proseWrap": "never" + "proseWrap": "never", + "overrides": [ + { + "files": "*.{yml,yaml}", + "options": { + "tabWidth": 2, + "useTabs": false + } + } + ] } From 1fb7bdbd850d918f9f8c730e8e92db8d0d80be44 Mon Sep 17 00:00:00 2001 From: Maxim Kovalov Date: Mon, 19 Oct 2020 14:19:17 +0300 Subject: [PATCH 03/11] feat: ignore yarn postinstall --- .circleci/config.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a2e81d3bd..6df203e75 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -70,7 +70,7 @@ jobs: sudo apt-get install libusb-1.0-0 libusb-1.0-0-dev libudev-dev - run: name: Install Node Packages - command: yarn install-all + command: NOYARNPOSTINSTALL=1 yarn - run: name: Unit Tests command: | diff --git a/package.json b/package.json index e24f02d1a..ae67f904d 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "check-deps": "npm-check -i common", "coveralls": "cat dist/coverage/lcov.info | coveralls", "snyk-protect": "NODE_OPTIONS=--max-old-space-size=8192 snyk protect", - "postinstall": "yarn build-dll", + "postinstall": "test -n \"$NOYARNPOSTINSTALL\" || yarn build-dll", "build-dll": "rm -rf node_modules/.cache && electron-webpack dll --env.production=${BUILD_DLL_PRODUCTION:-true}", "build-dev-dll": "BUILD_DLL_PRODUCTION=false yarn build-dll", "storybook": "start-storybook -p 6007", From ec12ee542f781f4a75fb23d583c0b68d07d10610 Mon Sep 17 00:00:00 2001 From: Maxim Kovalov Date: Mon, 19 Oct 2020 14:34:50 +0300 Subject: [PATCH 04/11] feat: ignore yarn postinstall --- .circleci/config.yml | 8 ++++---- package.json | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6df203e75..751f56863 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -77,10 +77,10 @@ jobs: TESTFILES=$(circleci tests glob "src/**/*.{spec,test}.js" | circleci tests split) echo "This job runs the following tests:" echo circleci tests glob "src/**/*.{spec,test}.js" | circleci tests split | xargs -n 1 echo - yarn test:unit:ci $TESTFILES - - run: - name: Coveralls - command: yarn coveralls + yarn test:unit:ci:split $TESTFILES + # - run: + # name: Coveralls + # command: yarn coveralls - store_test_results: path: dist/junit - store_artifacts: diff --git a/package.json b/package.json index ae67f904d..55cd6fbfb 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,8 @@ "test:unit": "jest -i --forceExit", "test:unit:coverage": "yarn test:unit --testPathPattern='src' --coverage", "test:unit:ci": "yarn test:unit:coverage --ci --reporters=default --reporters=jest-junit", - "test:e2e": "jest -i --config='jest.e2e.config.js'", + "test:unit:ci:split": "jest -i --forceExit --coverage", + "test:e2e": "jest -i --config='jest.e2e.config.js' --ci --reporters=default --reporters=jest-junit", "publish-build": "yarn compile && electron-builder -p always", "check-deps-precommit": "npm-check -i eslint -i redux -s || true", "check-deps": "npm-check -i common", From 0a7074b884c22082ffa9048db69b50ad71434c24 Mon Sep 17 00:00:00 2001 From: Maxim Kovalov Date: Mon, 19 Oct 2020 14:53:27 +0300 Subject: [PATCH 05/11] feat: fix file download --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 751f56863..16f21e3a6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -76,7 +76,7 @@ jobs: command: | TESTFILES=$(circleci tests glob "src/**/*.{spec,test}.js" | circleci tests split) echo "This job runs the following tests:" - echo circleci tests glob "src/**/*.{spec,test}.js" | circleci tests split | xargs -n 1 echo + circleci tests glob "src/**/*.{spec,test}.js" | circleci tests split | xargs -n 1 echo yarn test:unit:ci:split $TESTFILES # - run: # name: Coveralls @@ -178,7 +178,8 @@ jobs: - yarn-packages-win- - run: tzutil /s "UTC" - run: git config --global core.autocrlf input - - run: Start-FileDownload 'https://storage.googleapis.com/win-open-ssl/Win64OpenSSL-1_0_2r.exe' + - run: $wc = New-Object System.Net.WebClient + - run: $wc.DownloadFile('https://storage.googleapis.com/win-open-ssl/Win64OpenSSL-1_0_2r.exe', 'Win64OpenSSL-1_0_2r.exe') - run: Start-Process 'Win64OpenSSL-1_0_2r.exe' -ArgumentList '/silent /verysilent /sp- /suppressmsgboxes' -Wait - run: Start-Process 'GoogleCloudSDKInstaller.exe' -ArgumentList '/S' -Wait - run: refreshenv From 52477a6bda85bfbf4bdb82554e805c3576115a5c Mon Sep 17 00:00:00 2001 From: Maxim Kovalov Date: Mon, 19 Oct 2020 14:55:19 +0300 Subject: [PATCH 06/11] feat: split by timinng --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 16f21e3a6..55bc674b5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -74,9 +74,9 @@ jobs: - run: name: Unit Tests command: | - TESTFILES=$(circleci tests glob "src/**/*.{spec,test}.js" | circleci tests split) + TESTFILES=$(circleci tests glob "src/**/*.{spec,test}.js" | circleci tests split --split-by=timings) echo "This job runs the following tests:" - circleci tests glob "src/**/*.{spec,test}.js" | circleci tests split | xargs -n 1 echo + circleci tests glob "src/**/*.{spec,test}.js" | circleci tests split --split-by=timings| xargs -n 1 echo yarn test:unit:ci:split $TESTFILES # - run: # name: Coveralls From 461b0aad1e33d1999245387999d5f4d6db471bcc Mon Sep 17 00:00:00 2001 From: Maxim Kovalov Date: Mon, 19 Oct 2020 15:53:23 +0300 Subject: [PATCH 07/11] feat: spwindows download --- .circleci/config.yml | 51 +++++++++++++++++++++++++++++++++++++------- jest.config.js | 2 +- 2 files changed, 44 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 55bc674b5..bcc6bf842 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -55,7 +55,7 @@ jobs: CACHE_VERSION: *cache_version JEST_JUNIT_OUTPUT_DIR: dist/junit JEST_JUNIT_UNIQUE_OUTPUT_NAME: 'true' - parallelism: 4 + parallelism: 2 steps: - checkout - attach_workspace: @@ -77,15 +77,41 @@ jobs: TESTFILES=$(circleci tests glob "src/**/*.{spec,test}.js" | circleci tests split --split-by=timings) echo "This job runs the following tests:" circleci tests glob "src/**/*.{spec,test}.js" | circleci tests split --split-by=timings| xargs -n 1 echo - yarn test:unit:ci:split $TESTFILES - # - run: - # name: Coveralls - # command: yarn coveralls + yarn test:unit:ci:split $TESTFILES --coverageDirectory='dist/coverage/${CIRCLE_NODE_INDEX}/' - store_test_results: path: dist/junit - store_artifacts: path: dist - *step_save_cache + 'coveralls': + docker: *DOCKERIMAGE + environment: + CACHE_VERSION: *cache_version + steps: + - run: + name: Install OS Icov + command: | + sudo apt-get update -y + apt-get install -y lcov + - checkout + - attach_workspace: + at: /tmp/linux + - *step_prepare_cache_buster + - *step_restore_cache + - run: + name: Get storybook from attach_workspace + command: | + mkdir -p dist + cp -r /tmp/linux/dist/coverage dist/coverage + - run: + name: Merge coverage reports + command: find dist/coverage -name lcov.info -exec echo -a {} \; | xargs lcov -o dist/coverage/lcov.info + - run: + name: Coveralls + command: yarn coveralls + - store_artifacts: + path: dist + 'build-storybook': docker: *DOCKERIMAGE environment: @@ -178,10 +204,12 @@ jobs: - yarn-packages-win- - run: tzutil /s "UTC" - run: git config --global core.autocrlf input - - run: $wc = New-Object System.Net.WebClient - - run: $wc.DownloadFile('https://storage.googleapis.com/win-open-ssl/Win64OpenSSL-1_0_2r.exe', 'Win64OpenSSL-1_0_2r.exe') + - run: + name: 'Install OpenSSL' + command: | + $wc = New-Object System.Net.WebClient + $wc.DownloadFile("https://storage.googleapis.com/win-open-ssl/Win64OpenSSL-1_0_2r.exe", "Win64OpenSSL-1_0_2r.exe") - run: Start-Process 'Win64OpenSSL-1_0_2r.exe' -ArgumentList '/silent /verysilent /sp- /suppressmsgboxes' -Wait - - run: Start-Process 'GoogleCloudSDKInstaller.exe' -ArgumentList '/S' -Wait - run: refreshenv - run: Install-Product node $env:nodejs_version x64 - run: npm i -g yarn @@ -472,6 +500,13 @@ workflows: branches: ignore: - auto-update-test + - coveralls: + requires: + - unit-test + filters: + branches: + ignore: + - auto-update-test - 'build-linux': requires: - unit-test diff --git a/jest.config.js b/jest.config.js index 27907ebe2..497e16b4a 100644 --- a/jest.config.js +++ b/jest.config.js @@ -13,7 +13,7 @@ module.exports = { testEnvironment: 'jsdom', testURL: 'http://localhost/', collectCoverageFrom: ['src/{main,common}/**/*.js'], - coverageReporters: ['json', 'lcov', 'text'], + coverageReporters: ['lcov'], coveragePathIgnorePatterns: ['src/main/(seed|assets|migrations)'], coverageDirectory: 'dist/coverage', coverageThreshold: {}, From 7be8e6864df68f4eacaae6c1294887bd8eceee6c Mon Sep 17 00:00:00 2001 From: Maxim Kovalov Date: Mon, 19 Oct 2020 16:22:39 +0300 Subject: [PATCH 08/11] feat: windows fix --- .circleci/config.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bcc6bf842..9b3b5f664 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -92,7 +92,7 @@ jobs: name: Install OS Icov command: | sudo apt-get update -y - apt-get install -y lcov + sudo apt-get install -y lcov - checkout - attach_workspace: at: /tmp/linux @@ -209,10 +209,13 @@ jobs: command: | $wc = New-Object System.Net.WebClient $wc.DownloadFile("https://storage.googleapis.com/win-open-ssl/Win64OpenSSL-1_0_2r.exe", "Win64OpenSSL-1_0_2r.exe") - - run: Start-Process 'Win64OpenSSL-1_0_2r.exe' -ArgumentList '/silent /verysilent /sp- /suppressmsgboxes' -Wait + Start-Process 'Win64OpenSSL-1_0_2r.exe' -ArgumentList '/silent /verysilent /sp- /suppressmsgboxes' -Wait + - run: + name: Install Node + command: | + choco install nodejs.install --version=10.13.0 + npm i -g yarn - run: refreshenv - - run: Install-Product node $env:nodejs_version x64 - - run: npm i -g yarn - run: yarn install-all - run: npm config set msvs_version 2015 --global - run: echo {"dsn":"%SENTRY_DSN%"} > src\assets\data\sentry.json From 27b876d3d77e439743a5b22e511fc6b0f1c2ff10 Mon Sep 17 00:00:00 2001 From: Maxim Kovalov Date: Mon, 19 Oct 2020 16:25:37 +0300 Subject: [PATCH 09/11] feat: windows fix --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9b3b5f664..e5a3faee5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -77,7 +77,7 @@ jobs: TESTFILES=$(circleci tests glob "src/**/*.{spec,test}.js" | circleci tests split --split-by=timings) echo "This job runs the following tests:" circleci tests glob "src/**/*.{spec,test}.js" | circleci tests split --split-by=timings| xargs -n 1 echo - yarn test:unit:ci:split $TESTFILES --coverageDirectory='dist/coverage/${CIRCLE_NODE_INDEX}/' + yarn test:unit:ci:split $TESTFILES --coverageDirectory="dist/coverage/${CIRCLE_NODE_INDEX}/" - store_test_results: path: dist/junit - store_artifacts: @@ -297,7 +297,6 @@ jobs: - run: name: E2E Tests command: OSENV=circle-mac yarn test:e2e - 'e2e-linux': docker: *DOCKERIMAGE environment: From babf46224a7ae046994c183ed605c9f3c8388815 Mon Sep 17 00:00:00 2001 From: Maxim Kovalov Date: Mon, 19 Oct 2020 16:43:50 +0300 Subject: [PATCH 10/11] feat: windows fix --- .circleci/config.yml | 13 ++++++++++--- package.json | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e5a3faee5..88dc5371f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -55,6 +55,7 @@ jobs: CACHE_VERSION: *cache_version JEST_JUNIT_OUTPUT_DIR: dist/junit JEST_JUNIT_UNIQUE_OUTPUT_NAME: 'true' + JEST_JUNIT_ADD_FILE_ATTRIBUTE: 'true' parallelism: 2 steps: - checkout @@ -80,8 +81,10 @@ jobs: yarn test:unit:ci:split $TESTFILES --coverageDirectory="dist/coverage/${CIRCLE_NODE_INDEX}/" - store_test_results: path: dist/junit - - store_artifacts: - path: dist + - persist_to_workspace: + root: . + paths: + - dist - *step_save_cache 'coveralls': docker: *DOCKERIMAGE @@ -215,9 +218,13 @@ jobs: command: | choco install nodejs.install --version=10.13.0 npm i -g yarn + - run: + name: Install Build Tools + command: | + npm install --global windows-build-tools --vs2015 + npm config set msvs_version 2015 --global - run: refreshenv - run: yarn install-all - - run: npm config set msvs_version 2015 --global - run: echo {"dsn":"%SENTRY_DSN%"} > src\assets\data\sentry.json - run: yarn dist --publish=never - store_artifacts: diff --git a/package.json b/package.json index 55cd6fbfb..282862c46 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "test:unit": "jest -i --forceExit", "test:unit:coverage": "yarn test:unit --testPathPattern='src' --coverage", "test:unit:ci": "yarn test:unit:coverage --ci --reporters=default --reporters=jest-junit", - "test:unit:ci:split": "jest -i --forceExit --coverage", + "test:unit:ci:split": "jest -i --forceExit --ci --coverage", "test:e2e": "jest -i --config='jest.e2e.config.js' --ci --reporters=default --reporters=jest-junit", "publish-build": "yarn compile && electron-builder -p always", "check-deps-precommit": "npm-check -i eslint -i redux -s || true", From 3de07303203002ff013b643b0295c41c635263ea Mon Sep 17 00:00:00 2001 From: Maxim Kovalov Date: Tue, 20 Oct 2020 07:29:49 +0300 Subject: [PATCH 11/11] feat(circleci): windows build wip --- .circleci/config.yml | 20 +++++++++++++------- package.json | 2 +- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 88dc5371f..21cf3fb2b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -102,7 +102,7 @@ jobs: - *step_prepare_cache_buster - *step_restore_cache - run: - name: Get storybook from attach_workspace + name: Get coverage from attach_workspace command: | mkdir -p dist cp -r /tmp/linux/dist/coverage dist/coverage @@ -213,18 +213,24 @@ jobs: $wc = New-Object System.Net.WebClient $wc.DownloadFile("https://storage.googleapis.com/win-open-ssl/Win64OpenSSL-1_0_2r.exe", "Win64OpenSSL-1_0_2r.exe") Start-Process 'Win64OpenSSL-1_0_2r.exe' -ArgumentList '/silent /verysilent /sp- /suppressmsgboxes' -Wait + refreshenv - run: name: Install Node command: | - choco install nodejs.install --version=10.13.0 + nvm use 10.13.0 npm i -g yarn - run: name: Install Build Tools command: | - npm install --global windows-build-tools --vs2015 + npm install --global --production windows-build-tools@4.0.0 npm config set msvs_version 2015 --global - - run: refreshenv - - run: yarn install-all + npm config set python %USERPROFILE%\.windows-build-tools\python27 + - run: + name: Install Deps + command: | + yarn install + yarn build-dll + yarn install-app-deps - run: echo {"dsn":"%SENTRY_DSN%"} > src\assets\data\sentry.json - run: yarn dist --publish=never - store_artifacts: @@ -241,7 +247,7 @@ jobs: NO_PROXY: 127.0.0.1,localhost steps: - checkout - - run: Write-Host 'Hello, Windows' + - run: Write-Host 'TODO implement' 'publish-windows': executor: win/default environment: @@ -249,7 +255,7 @@ jobs: NO_PROXY: 127.0.0.1,localhost steps: - checkout - - run: Write-Host 'Hello, Windows' + - run: Write-Host 'TODO implement' 'build-linux': docker: *DOCKERIMAGE environment: diff --git a/package.json b/package.json index 282862c46..2411b3866 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "test:unit": "jest -i --forceExit", "test:unit:coverage": "yarn test:unit --testPathPattern='src' --coverage", "test:unit:ci": "yarn test:unit:coverage --ci --reporters=default --reporters=jest-junit", - "test:unit:ci:split": "jest -i --forceExit --ci --coverage", + "test:unit:ci:split": "jest -i --forceExit --ci --coverage --reporters=default --reporters=jest-junit", "test:e2e": "jest -i --config='jest.e2e.config.js' --ci --reporters=default --reporters=jest-junit", "publish-build": "yarn compile && electron-builder -p always", "check-deps-precommit": "npm-check -i eslint -i redux -s || true",