From f1387e6754e2d75182c42f70ab30519e3c86cef3 Mon Sep 17 00:00:00 2001 From: Martin Bayly Date: Thu, 7 Feb 2019 00:12:26 -0800 Subject: [PATCH 1/8] 4.0.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8fbbfea..008ea70 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "sauce-connect-launcher": "^1.2.4", "wct-browser-legacy": "^1.0.1" }, - "version": "", + "version": "4.0.1", "resolutions": { "inherits": "2.0.3", "samsam": "1.1.3", From 43f6085b41965987f2aff2532910c5847c7b3576 Mon Sep 17 00:00:00 2001 From: Martin Bayly Date: Thu, 7 Feb 2019 00:50:09 -0800 Subject: [PATCH 2/8] 4.0.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 008ea70..b16604c 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "sauce-connect-launcher": "^1.2.4", "wct-browser-legacy": "^1.0.1" }, - "version": "4.0.1", + "version": "4.0.2", "resolutions": { "inherits": "2.0.3", "samsam": "1.1.3", From af1a9c7fdbd3ce9d2ce6439d3ed1abc00a597b3d Mon Sep 17 00:00:00 2001 From: Martin Bayly Date: Sun, 17 Feb 2019 14:08:05 -0800 Subject: [PATCH 3/8] add frau-ci to enable automatic versioning on commit to master --- .travis.yml | 17 +++++++++++++++-- README.md | 9 +++++++++ package.json | 1 + 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3b36c79..9c7454c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: node_js -node_js: node -addons: +node_js: node +addons: chrome: stable script: - npm run test:lint @@ -12,7 +12,20 @@ script: echo "Not a pull request and/or no secure environment variables, running headless tests..."; npm run test:polymer:local || travis_terminate 1; fi +- | + if [ "$TRAVIS_BRANCH" == "master" ] && [ $TRAVIS_PULL_REQUEST == false ]; then + echo "Not a Pull Request and on branch master so bumping version"; + frauci-update-version; + export TRAVIS_TAG=$(frauci-get-version) + fi +deploy: + provider: releases + api_key: "$GITHUB_RELEASE_TOKEN" + on: + tags: true env: global: + - REPO_NAME=offscreen - SAUCE_USERNAME: Desire2Learn - secure: RtWC2uMUHvox7Y/qdWd7wrxEYedg1MdnZp9aoI2jL8KP4gi/efeFhzBIjIShnv6hnkJdf7Vy+5PTwgp4q6i4HZzmIAjyEGX+J5xd8emd3yrYg2puBrKI4bE+qzjnrWsc/9tbeqbRviFZzJzLzGCz9t1H3m/USKnzU71z7M3lFlA= + - secure: QZCXkJJHV+dL29b829G9Mluib5o0KcZTl6SQIZ2VhVDAndHE+B1Ng8pO4X3LFvb1qzvcjZTuoygByuDGjAhYcWRAfsghwHDs4iWG3De4Df7YDVPyMoD5qTJnqJoCq1JV5l6++RpGSN7sjcZGLQnZN7lip73vQDbN+3YeKbBl6QA= diff --git a/README.md b/README.md index df35426..3afa014 100644 --- a/README.md +++ b/README.md @@ -140,3 +140,12 @@ npm test [bower-image]: https://img.shields.io/bower/v/d2l-offscreen.svg [ci-image]: https://travis-ci.org/BrightspaceUI/offscreen.svg?branch=master [ci-url]: https://travis-ci.org/BrightspaceUI/offscreen + +## Versioning + +Commits and PR merges to master will automatically do a minor version bump which will: +* Update the version in `package.json` +* Add a tag matching the new version +* Create a github release matching the new version + +By using either **[increment major]** or **[increment patch]** notation inside your merge message, you can overwrite the default version upgrade of minor to the position of your choice. diff --git a/package.json b/package.json index b16604c..251310e 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "eslint": "^4.15.0", "eslint-config-brightspace": "^0.4.0", "eslint-plugin-html": "^4.0.1", + "frau-ci": "^1.33.2", "polymer-cli": "^1.9.1", "sauce-connect-launcher": "^1.2.4", "wct-browser-legacy": "^1.0.1" From 56e2beb8bb9f15fae9df1df3f8ad811f6e191baa Mon Sep 17 00:00:00 2001 From: Martin Bayly Date: Sun, 17 Feb 2019 14:43:11 -0800 Subject: [PATCH 4/8] put back lf line endings on travis.yml --- .travis.yml | 62 ++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9c7454c..a9a1216 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,31 +1,31 @@ -language: node_js -node_js: node -addons: - chrome: stable -script: -- npm run test:lint -- | - if [ $TRAVIS_PULL_REQUEST != false ] && [ $TRAVIS_SECURE_ENV_VARS == true ]; then - echo "Pull request with secure environment variables, running Sauce tests..."; - npm run test:polymer:sauce || travis_terminate 1; - else - echo "Not a pull request and/or no secure environment variables, running headless tests..."; - npm run test:polymer:local || travis_terminate 1; - fi -- | - if [ "$TRAVIS_BRANCH" == "master" ] && [ $TRAVIS_PULL_REQUEST == false ]; then - echo "Not a Pull Request and on branch master so bumping version"; - frauci-update-version; - export TRAVIS_TAG=$(frauci-get-version) - fi -deploy: - provider: releases - api_key: "$GITHUB_RELEASE_TOKEN" - on: - tags: true -env: - global: - - REPO_NAME=offscreen - - SAUCE_USERNAME: Desire2Learn - - secure: RtWC2uMUHvox7Y/qdWd7wrxEYedg1MdnZp9aoI2jL8KP4gi/efeFhzBIjIShnv6hnkJdf7Vy+5PTwgp4q6i4HZzmIAjyEGX+J5xd8emd3yrYg2puBrKI4bE+qzjnrWsc/9tbeqbRviFZzJzLzGCz9t1H3m/USKnzU71z7M3lFlA= - - secure: QZCXkJJHV+dL29b829G9Mluib5o0KcZTl6SQIZ2VhVDAndHE+B1Ng8pO4X3LFvb1qzvcjZTuoygByuDGjAhYcWRAfsghwHDs4iWG3De4Df7YDVPyMoD5qTJnqJoCq1JV5l6++RpGSN7sjcZGLQnZN7lip73vQDbN+3YeKbBl6QA= +language: node_js +node_js: node +addons: + chrome: stable +script: +- npm run test:lint +- | + if [ $TRAVIS_PULL_REQUEST != false ] && [ $TRAVIS_SECURE_ENV_VARS == true ]; then + echo "Pull request with secure environment variables, running Sauce tests..."; + npm run test:polymer:sauce || travis_terminate 1; + else + echo "Not a pull request and/or no secure environment variables, running headless tests..."; + npm run test:polymer:local || travis_terminate 1; + fi +- | + if [ "$TRAVIS_BRANCH" == "master" ] && [ $TRAVIS_PULL_REQUEST == false ]; then + echo "Not a Pull Request and on branch master so bumping version"; + frauci-update-version; + export TRAVIS_TAG=$(frauci-get-version) + fi +deploy: + provider: releases + api_key: "$GITHUB_RELEASE_TOKEN" + on: + tags: true +env: + global: + - REPO_NAME=offscreen + - SAUCE_USERNAME: Desire2Learn + - secure: RtWC2uMUHvox7Y/qdWd7wrxEYedg1MdnZp9aoI2jL8KP4gi/efeFhzBIjIShnv6hnkJdf7Vy+5PTwgp4q6i4HZzmIAjyEGX+J5xd8emd3yrYg2puBrKI4bE+qzjnrWsc/9tbeqbRviFZzJzLzGCz9t1H3m/USKnzU71z7M3lFlA= + - secure: QZCXkJJHV+dL29b829G9Mluib5o0KcZTl6SQIZ2VhVDAndHE+B1Ng8pO4X3LFvb1qzvcjZTuoygByuDGjAhYcWRAfsghwHDs4iWG3De4Df7YDVPyMoD5qTJnqJoCq1JV5l6++RpGSN7sjcZGLQnZN7lip73vQDbN+3YeKbBl6QA= From f9f4ca549397292350e2fabe42b98107d34bcd19 Mon Sep 17 00:00:00 2001 From: Martin Bayly Date: Sun, 17 Feb 2019 14:57:52 -0800 Subject: [PATCH 5/8] 4.0.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 251310e..630b357 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "sauce-connect-launcher": "^1.2.4", "wct-browser-legacy": "^1.0.1" }, - "version": "4.0.2", + "version": "4.0.3", "resolutions": { "inherits": "2.0.3", "samsam": "1.1.3", From 3fa577153fff481a8f9d7e38950a048ce1ba94e8 Mon Sep 17 00:00:00 2001 From: Martin Bayly Date: Mon, 1 Apr 2019 17:37:48 -0700 Subject: [PATCH 6/8] Fix travis.yml to include repo owner name to allow auto version on commit --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index a9a1216..493a57c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,7 @@ deploy: tags: true env: global: + - OWNER_NAME=BrightspaceUI - REPO_NAME=offscreen - SAUCE_USERNAME: Desire2Learn - secure: RtWC2uMUHvox7Y/qdWd7wrxEYedg1MdnZp9aoI2jL8KP4gi/efeFhzBIjIShnv6hnkJdf7Vy+5PTwgp4q6i4HZzmIAjyEGX+J5xd8emd3yrYg2puBrKI4bE+qzjnrWsc/9tbeqbRviFZzJzLzGCz9t1H3m/USKnzU71z7M3lFlA= From 7cc85515955ae05a88e58113bf6fb845222cd7df Mon Sep 17 00:00:00 2001 From: Martin Bayly Date: Tue, 2 Apr 2019 09:22:45 -0700 Subject: [PATCH 7/8] 4.0.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 630b357..0036f71 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "sauce-connect-launcher": "^1.2.4", "wct-browser-legacy": "^1.0.1" }, - "version": "4.0.3", + "version": "4.0.4", "resolutions": { "inherits": "2.0.3", "samsam": "1.1.3", From f57e797b295fd16b52f294778bffb2e9ed14acf3 Mon Sep 17 00:00:00 2001 From: Martin Bayly Date: Wed, 10 Apr 2019 12:03:22 -0700 Subject: [PATCH 8/8] Fix travis.yml to exclude versioning when running cron builds --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 493a57c..1b3e90d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ script: npm run test:polymer:local || travis_terminate 1; fi - | - if [ "$TRAVIS_BRANCH" == "master" ] && [ $TRAVIS_PULL_REQUEST == false ]; then + if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_PULL_REQUEST == false ] && [ $TRAVIS_EVENT_TYPE != "cron" ]; then echo "Not a Pull Request and on branch master so bumping version"; frauci-update-version; export TRAVIS_TAG=$(frauci-get-version)