diff --git a/.circleci/config.yml b/.circleci/config.yml index 30bc5e0..83432ac 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,10 +12,7 @@ jobs: - v0-yarn-{{checksum ".circleci/config.yml"}}-{{ .Branch }}-{{checksum "yarn.lock"}} - v0-yarn-{{checksum ".circleci/config.yml"}}-{{ .Branch }}- - v0-yarn-{{checksum ".circleci/config.yml"}}-master- - - run: .circleci/setup_git - - run: .circleci/yarn - - run: yarn test - - run: curl -s https://codecov.io/bash | bash + - run: .circleci/test - store_test_results: &store_test_results path: ~/cli/reports - save_cache: &save_cache @@ -31,10 +28,7 @@ jobs: steps: - checkout - restore_cache: *restore_cache - - run: .circleci/setup_git - - run: .circleci/yarn - - run: yarn test - - run: curl -s https://codecov.io/bash | bash + - run: .circleci/test - store_test_results: *store_test_results release: <<: *test @@ -42,10 +36,7 @@ jobs: - add_ssh_keys - checkout - restore_cache: *restore_cache - - run: .circleci/setup_git - - run: .circleci/yarn - - run: yarn add -D @anycli/semantic-release@1 - - run: yarn exec nps release + - run: .circleci/release workflows: version: 2 diff --git a/.circleci/release b/.circleci/release new file mode 100755 index 0000000..b79d957 --- /dev/null +++ b/.circleci/release @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +set -ex + +.circleci/setup_git + +PATH=/usr/local/share/.config/yarn/global/node_modules/.bin:$PATH + +yarn global add @dxcli/semantic-release@1 semantic-release@12 +yarn install --frozen-lockfile +semantic-release -e @dxcli/semantic-release diff --git a/.circleci/yarn b/.circleci/test similarity index 83% rename from .circleci/yarn rename to .circleci/test index e097b26..deb213c 100755 --- a/.circleci/yarn +++ b/.circleci/test @@ -2,6 +2,8 @@ set -ex +.circleci/setup_git + PATH=/usr/local/share/.config/yarn/global/node_modules/.bin:$PATH CLI_ENGINE_UTIL_YARN_ARGS="--frozen-lockfile" @@ -20,3 +22,8 @@ yarn install $CLI_ENGINE_UTIL_YARN_ARGS if [[ "$CLI_ENGINE_GREENKEEPER_BRANCH" == 1 ]]; then greenkeeper-lockfile-upload fi + +yarn add -D nyc @dxcli/nyc-config +yarn test + +curl -s https://codecov.io/bash | bash diff --git a/README.md b/README.md index 2c0ae51..8d6f5c9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ eslint-config-anycli -=================== +==================== eslint config for anycli diff --git a/appveyor.yml b/appveyor.yml index 07e318a..9bf8c43 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,7 +10,7 @@ install: - git submodule update --init --recursive - git config --global user.email "anycli@example.com" - git config --global user.name "anycli" - - yarn + - yarn add -D nyc @anycli/nyc-config test_script: - yarn test after_test: diff --git a/package-scripts.js b/package-scripts.js index 3c48d7d..ad526c8 100644 --- a/package-scripts.js +++ b/package-scripts.js @@ -21,6 +21,5 @@ module.exports = { ...linters, lint: concurrent(linters), test, - release: 'anycli-semantic-release -e @anycli/semantic-release', }, } diff --git a/yarn.lock b/yarn.lock index 0bebebb..c1fcbcf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -394,8 +394,8 @@ concurrently@^3.4.0: tree-kill "^1.1.0" conventional-changelog-angular@^1.3.3: - version "1.6.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.6.0.tgz#0a26a071f2c9fcfcf2b86ba0cfbf6e6301b75bfa" + version "1.6.1" + resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.6.1.tgz#e1434d017c854032b272f690424a8c0ca16dc318" dependencies: compare-func "^1.3.1" q "^1.4.1" @@ -822,8 +822,8 @@ global-dirs@^0.1.0: ini "^1.3.4" globals@^11.0.1: - version "11.1.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.1.0.tgz#632644457f5f0e3ae711807183700ebf2e4633e4" + version "11.3.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.3.0.tgz#e04fdb7b9796d8adac9c8f64c14837b2313378b0" globby@^4.0.0: version "4.1.0" @@ -1008,8 +1008,8 @@ is-promise@^2.1.0: resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" is-resolvable@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.1.tgz#acca1cd36dbe44b974b924321555a70ba03b1cf4" + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" is-stream@^1.1.0: version "1.1.0" @@ -1644,14 +1644,18 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" -"semver@2 || 3 || 4 || 5", semver@5.4.1, semver@^5.3.0: - version "5.4.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" +"semver@2 || 3 || 4 || 5", semver@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" semver@5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" +semver@5.4.1: + version "5.4.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" + set-blocking@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"