From 77149c01cf0f9d55a6bbed714a26f28b04292964 Mon Sep 17 00:00:00 2001 From: Kepler Sticka-Jones Date: Mon, 16 Apr 2018 09:28:33 -0600 Subject: [PATCH 1/6] build(release): initial adoption of semantic-release and commitlint (#129) --- .travis.yml | 12 ++++++++++++ package.json | 23 +++++++++++++++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 01c4f9e..214e518 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,3 +39,15 @@ addons: - git - libgnome-keyring-dev - fakeroot + +node_js: lts/* + +after_success: + # Add apm to the PATH + - export PATH=${PATH}:${HOME}/atom/usr/bin/ + +deploy: + provider: script + skip_cleanup: true + script: + - npx semantic-release diff --git a/package.json b/package.json index bd970a1..8e90be5 100644 --- a/package.json +++ b/package.json @@ -24,5 +24,24 @@ "package-deps": [ "linter", "language-rust" - ] -} + ], + "release": { + "extends": "@semantic-release/apm-config" + }, + "commitlint": { + "extends": [ + "@commitlint/config-conventional" + ] + }, + "devDependencies": { + "@commitlint/cli": "^6.1.3", + "@commitlint/config-conventional": "^6.1.3", + "@commitlint/travis-cli": "^6.1.3", + "@semantic-release/apm-config": "^2.0.1", + "husky": "^0.14.3", + "semantic-release": "^15.1.7" + }, + "scripts": { + "commitmsg": "commitlint -e $GIT_PARAMS" + } +} \ No newline at end of file From 5e0dbfe88a507ebb93b8a7954bc10f1ca74ffd3d Mon Sep 17 00:00:00 2001 From: Landon Abney Date: Sat, 21 Apr 2018 17:04:54 -0700 Subject: [PATCH 2/6] ci: fix deployment scripts Use build stages to only run the deployment script when running onmaster. Ensure that the latest LTS release of Node.js is installed inthe deployment build before attempting to run it, and add `commitlint`to the test stage to ensure commit messages are linted. --- .travis.yml | 50 ++++++++++++++++++++++++++++---------------------- package.json | 9 ++++++--- 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index 214e518..6e8606d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,21 +1,33 @@ ### Project specific config ### language: rust +rust: stable +os: linux -matrix: - include: - - os: linux - env: ATOM_CHANNEL=stable - rust: stable +env: + matrix: + - ATOM_CHANNEL=stable + - ATOM_CHANNEL=beta + +script: + - commitlint-travis - - os: linux - env: ATOM_CHANNEL=beta - rust: beta +jobs: + include: + - stage: release + script: + - export PATH=${PATH}:${HOME}/atom/usr/bin/ + deploy: + provider: script + skip_cleanup: true + script: + - nvm install lts/* + - npx semantic-release ### Generic setup follows ### -script: +install: - curl -s -O https://raw.githubusercontent.com/atom/ci/master/build-package.sh - chmod u+x build-package.sh - - ./build-package.sh + - "./build-package.sh" notifications: email: @@ -25,11 +37,12 @@ notifications: branches: only: - master - - /^greenkeeper/.*$/ + - "/^greenkeeper/.*$/" git: depth: 10 +dist: trusty sudo: false addons: @@ -40,14 +53,7 @@ addons: - libgnome-keyring-dev - fakeroot -node_js: lts/* - -after_success: - # Add apm to the PATH - - export PATH=${PATH}:${HOME}/atom/usr/bin/ - -deploy: - provider: script - skip_cleanup: true - script: - - npx semantic-release +stages: + - test + - name: release + if: (NOT type = pull_request) AND branch = master diff --git a/package.json b/package.json index 8e90be5..d40bbe0 100644 --- a/package.json +++ b/package.json @@ -3,10 +3,13 @@ "main": "./lib/init", "version": "0.8.4", "description": "Lint Rust-files, using rustc and/or cargo", - "repository": "https://github.com/AtomLinter/linter-rust", + "repository": { + "type": "git", + "url": "https://github.com/AtomLinter/linter-rust.git" + }, "license": "MIT", "engines": { - "atom": ">0.50.0" + "atom": ">=1.0.0 <2.0.0" }, "providedServices": { "linter": { @@ -44,4 +47,4 @@ "scripts": { "commitmsg": "commitlint -e $GIT_PARAMS" } -} \ No newline at end of file +} From b418a4d48109b338a2001dd6071a4280a37401c7 Mon Sep 17 00:00:00 2001 From: Landon Abney Date: Sat, 21 Apr 2018 17:31:35 -0700 Subject: [PATCH 3/6] ci: make each stage explicit Make each stage of the build explicit, allowing us to keep stable andbeta builds of Rust, as well as run `commitlint` in a separate job. --- .travis.yml | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e8606d..c0eac8c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,30 @@ ### Project specific config ### -language: rust -rust: stable os: linux -env: - matrix: - - ATOM_CHANNEL=stable - - ATOM_CHANNEL=beta - -script: - - commitlint-travis - jobs: include: + - stage: test + language: rust + rust: stable + env: ATOM_CHANNEL=stable + script: skip + - stage: test + language: rust + rust: beta + env: ATOM_CHANNEL=beta + script: skip + - stage: test + language: node_js + node_js: lts/* + install: + - npm install + script: + - commitlint-travis - stage: release + # Since the deploy needs APM, currently the simplest method is to run + # build-package.sh, which requires the specs to pass, so this must run on Rust + language: rust + rust: stable script: - export PATH=${PATH}:${HOME}/atom/usr/bin/ deploy: From 89b9a73ed6c108381d06c8eef0bbd3123a411a57 Mon Sep 17 00:00:00 2001 From: Landon Abney Date: Sat, 21 Apr 2018 19:07:24 -0700 Subject: [PATCH 4/6] ci: don't install latest Node.js in deploy Remove the `nvm install lts/*` line from the deploy script as the default Node.js version _should_ be sufficient. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c0eac8c..ef55f57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,6 @@ jobs: provider: script skip_cleanup: true script: - - nvm install lts/* - npx semantic-release ### Generic setup follows ### From 8d401d67f8bf3d1515a1a14f9449120831c6c108 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 21 Feb 2018 10:50:50 +0000 Subject: [PATCH 5/6] fix(package): update xregexp to version 4.1.1 Closes #124 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d40bbe0..bd25d7a 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "atom-linter": "^10.0.0", "atom-package-deps": "^4.3.1", "semver": "^5.3.0", - "xregexp": "^3.1.1" + "xregexp": "^4.1.1" }, "package-deps": [ "linter", From b1bcf51868ff0cb681a4b0f2a6ddeb67a2e6ae9f Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sun, 22 Apr 2018 02:42:05 +0000 Subject: [PATCH 6/6] chore(release): 0.8.5 [skip ci] --- CHANGELOG.md | 8 ++++++++ package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1395285..0466c66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ + +## [0.8.5](https://github.com/AtomLinter/linter-rust/compare/v0.8.4...v0.8.5) (2018-04-22) + + +### Bug Fixes + +* **package:** update xregexp to version 4.1.1 ([8d401d6](https://github.com/AtomLinter/linter-rust/commit/8d401d6)), closes [#124](https://github.com/AtomLinter/linter-rust/issues/124) + # 0.8.4 * Fix 'check all' and Add 'test all' (@alkorang) * Description for 'check all' and 'test all' (@alkorang) diff --git a/package.json b/package.json index bd25d7a..e328639 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "linter-rust", "main": "./lib/init", - "version": "0.8.4", + "version": "0.8.5", "description": "Lint Rust-files, using rustc and/or cargo", "repository": { "type": "git",