From f3511752d7a4e185e14725b3e42572937852889c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominykas=20Blyz=CC=8Ce=CC=87?= Date: Sat, 29 Jun 2019 00:10:30 +0300 Subject: [PATCH 1/7] ci: test in node@12 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 85292e3..98e5d85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ sudo: false node_js: - "8" - "10" + - "12" - "node" install: From c83e51bcd135e32f6383a31438a2cd416806a5e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominykas=20Blyz=CC=8Ce=CC=87?= Date: Sat, 29 Jun 2019 00:18:48 +0300 Subject: [PATCH 2/7] ci: install forked @semantic-release/npm for otp testing --- package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package.json b/package.json index a080fd1..e36f776 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,12 @@ "devDependencies": { "@commitlint/cli": "7.x.x", "@commitlint/config-conventional": "7.x.x", + "@semantic-release/npm": "git+https://github.com/dominykas/semantic-release-npm.git#otp-url-with-version", "code": "5.x.x", "lab": "18.x.x", "mkdirp": "0.5.x", "rimraf": "2.x.x", + "semantic-release": "15.x.x", "sinon": "7.x.x" }, "files": [ From c6a94eafd52fcc97536f67a51e07a61597b291d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominykas=20Blyz=CC=8Ce=CC=87?= Date: Sat, 29 Jun 2019 00:30:58 +0300 Subject: [PATCH 3/7] ci: support NPM_OTP_URL --- .releaserc.js | 6 ++++++ package.json | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 .releaserc.js diff --git a/.releaserc.js b/.releaserc.js new file mode 100644 index 0000000..acfb39f --- /dev/null +++ b/.releaserc.js @@ -0,0 +1,6 @@ +module.exports = { + npmPublish: true, + tarballDir: '.', + assets: 'allow-scripts-*.tgz', + otpUrl: process.env.NPM_OTP_URL +}; diff --git a/package.json b/package.json index e36f776..445a7ac 100644 --- a/package.json +++ b/package.json @@ -39,10 +39,5 @@ "extends": [ "@commitlint/config-conventional" ] - }, - "release": { - "npmPublish": false, - "tarballDir": ".", - "assets": "allow-scripts-*.tgz" } } From 7036805b63fcce7248cff433f2ebbd6b1e63cdc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominykas=20Blyz=CC=8Ce=CC=87?= Date: Sat, 29 Jun 2019 00:33:48 +0300 Subject: [PATCH 4/7] fix: ignore core-js postinstall scripts --- package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package.json b/package.json index 445a7ac..439e8b6 100644 --- a/package.json +++ b/package.json @@ -39,5 +39,8 @@ "extends": [ "@commitlint/config-conventional" ] + }, + "allowScripts": { + "core-js": false } } From 4ad195abc061d74f0d969d03df30ee88c392bfa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominykas=20Blyz=CC=8Ce=CC=87?= Date: Sat, 29 Jun 2019 00:42:20 +0300 Subject: [PATCH 5/7] chore: use latest deps --- .eslintrc | 2 +- package.json | 8 ++++---- test/index.js | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.eslintrc b/.eslintrc index 52a74b6..1fcdea0 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,3 +1,3 @@ { - "extends": "./node_modules/lab/lib/linter/.eslintrc.js" + "extends": "@hapi/hapi" } diff --git a/package.json b/package.json index 439e8b6..73662d1 100644 --- a/package.json +++ b/package.json @@ -21,11 +21,11 @@ "semver": "6.x.x" }, "devDependencies": { - "@commitlint/cli": "7.x.x", - "@commitlint/config-conventional": "7.x.x", + "@commitlint/cli": "8.x.x", + "@commitlint/config-conventional": "8.x.x", + "@hapi/code": "^5.3.1", + "@hapi/lab": "^19.1.0", "@semantic-release/npm": "git+https://github.com/dominykas/semantic-release-npm.git#otp-url-with-version", - "code": "5.x.x", - "lab": "18.x.x", "mkdirp": "0.5.x", "rimraf": "2.x.x", "semantic-release": "15.x.x", diff --git a/test/index.js b/test/index.js index 6cc9202..fe0ab2c 100644 --- a/test/index.js +++ b/test/index.js @@ -8,8 +8,8 @@ const Path = require('path'); const Allow = require('..'); -const { describe, it, beforeEach, afterEach } = exports.lab = require('lab').script(); -const { expect } = require('code'); +const { describe, it, beforeEach, afterEach } = exports.lab = require('@hapi/lab').script(); +const { expect } = require('@hapi/code'); describe('allow-scripts', () => { From 1a80cfa842c06f85a7d164620f7bfc06f62a029b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominykas=20Blyz=CC=8Ce=CC=87?= Date: Sat, 29 Jun 2019 00:51:30 +0300 Subject: [PATCH 6/7] build: only run release from `master` --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 98e5d85..9241d71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ install: jobs: include: - stage: release + if: branch = master node_js: "10" deploy: provider: "script" From 6579e35682871e5de62721438b7750e2cdb65daf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominykas=20Blyz=CC=8Ce=CC=87?= Date: Sat, 29 Jun 2019 00:55:16 +0300 Subject: [PATCH 7/7] build: only run release from `push` jobs --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9241d71..78cc8de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ install: jobs: include: - stage: release - if: branch = master + if: branch = master AND type = push node_js: "10" deploy: provider: "script"