From 6643c42c9a1900dcac92d66fa9495e93f713ff37 Mon Sep 17 00:00:00 2001 From: rosen-vladimirov Date: Thu, 6 Dec 2018 08:38:30 +0200 Subject: [PATCH 1/3] feat: automate publish of patch tag Automate publish of patch tag when PR is merged in `release-patch` tag. --- .travis.yml | 8 ++++++++ .travis/add-publishConfig.js | 23 ++++++++++++++++++----- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index ea391870ad..1eed908d23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ branches: only: - master - release + - release-patch env: global: - DATE=$(date +%Y-%m-%d) @@ -58,3 +59,10 @@ deploy: branch: release api_key: secure: "FM9QLOkFq6JpHlfHkT1i2Ht1ZlttZLq7K3kQNLabw7Z5+BPMcy/f3LRJkAkYMezrKLKRkq1uXmhY0BapoTnR9AVEO/t4g6dtbZ1TZ3xBH/HHnFofTFubOrc7+61DJzKduYtnQ/sn3EEOkN8jrXSY9uas4qZh7PSm1hcfjPI8gdI=" +provider: npm + skip_cleanup: true + email: nativescript@telerik.com + on: + branch: release-patch + api_key: + secure: "FM9QLOkFq6JpHlfHkT1i2Ht1ZlttZLq7K3kQNLabw7Z5+BPMcy/f3LRJkAkYMezrKLKRkq1uXmhY0BapoTnR9AVEO/t4g6dtbZ1TZ3xBH/HHnFofTFubOrc7+61DJzKduYtnQ/sn3EEOkN8jrXSY9uas4qZh7PSm1hcfjPI8gdI=" diff --git a/.travis/add-publishConfig.js b/.travis/add-publishConfig.js index 306595c06a..7d03f227f1 100644 --- a/.travis/add-publishConfig.js +++ b/.travis/add-publishConfig.js @@ -2,20 +2,33 @@ const fsModule = require("fs"); const path = "./package.json"; -const fileOptions = {encoding: "utf-8"}; +const fileOptions = { encoding: "utf-8" }; const content = fsModule.readFileSync(path, fileOptions); const packageDef = JSON.parse(content); if (!packageDef.publishConfig) { - packageDef.publishConfig = {}; + packageDef.publishConfig = {}; } const branch = process.argv[2]; if (!branch) { - console.log("Please pass the branch name as an argument!"); - process.exit(1); + console.log("Please pass the branch name as an argument!"); + process.exit(1); +} + +switch (branch) { + case "release": + packageDef.publishConfig.tag = "rc"; + break; + case "release-patch": + packageDef.publishConfig.tag = "patch"; + break; + case "master": + packageDef.publishConfig.tag = "next"; + break; + default: + throw new Error(`Unable to publish as the branch ${branch} does not have corresponding tag. Supported branches are master (next tag), release (rc tag) and release-patch (patch tag)`); } -packageDef.publishConfig.tag = branch === "release" ? "rc" : "next"; const newContent = JSON.stringify(packageDef, null, " "); fsModule.writeFileSync(path, newContent, fileOptions); From b1f5b9962f98cfca654d9e88084bf0db54351698 Mon Sep 17 00:00:00 2001 From: fatme Date: Thu, 6 Dec 2018 10:18:58 +0200 Subject: [PATCH 2/3] chore: bump version to 5.1.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bfb1490ec2..bdc3a65a50 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nativescript", "preferGlobal": true, - "version": "5.1.0", + "version": "5.1.1", "author": "Telerik ", "description": "Command-line interface for building NativeScript projects", "bin": { From 9bca9dd81145d0212340999586765746c3f1b719 Mon Sep 17 00:00:00 2001 From: fatme Date: Thu, 6 Dec 2018 13:26:04 +0200 Subject: [PATCH 3/3] chore: add missing `-` before provider --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1eed908d23..109ed1d663 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,7 @@ deploy: branch: release api_key: secure: "FM9QLOkFq6JpHlfHkT1i2Ht1ZlttZLq7K3kQNLabw7Z5+BPMcy/f3LRJkAkYMezrKLKRkq1uXmhY0BapoTnR9AVEO/t4g6dtbZ1TZ3xBH/HHnFofTFubOrc7+61DJzKduYtnQ/sn3EEOkN8jrXSY9uas4qZh7PSm1hcfjPI8gdI=" -provider: npm +- provider: npm skip_cleanup: true email: nativescript@telerik.com on: