From d06e36b9002cba6d59b3659e6f56b18bab877b9b Mon Sep 17 00:00:00 2001 From: Martin Bayly Date: Thu, 7 Feb 2019 01:01:09 -0800 Subject: [PATCH 1/7] 2.0.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b3fb7df..d0cc0db 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "polymer-cli": "^1.9.4", "wct-browser-legacy": "^1.0.2" }, - "version": "", + "version": "2.0.2", "dependencies": { "@polymer/iron-a11y-keys": "^3.0.1", "@polymer/iron-dropdown": "^3.0.1", From a80c90f507fb4db396663b4729e8a9605941d3f6 Mon Sep 17 00:00:00 2001 From: Martin Bayly Date: Sun, 17 Feb 2019 14:08:03 -0800 Subject: [PATCH 2/7] add frau-ci to enable automatic versioning on commit to master --- .travis.yml | 49 +++++++++++++++++++++++++++++++------------------ README.md | 9 +++++++++ package.json | 1 + 3 files changed, 41 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 18871cd..20cfd6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,31 @@ -language: node_js -node_js: node -addons: - chrome: stable -script: -- npm run 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 -env: - global: - - SAUCE_USERNAME: Desire2Learn - - secure: R9nrpeyuMcZTHnBcVAuMn+q/Fp9ti9K31tYlkBFhXtJc+rM/TYERiN195SRgbk2Gy6fK4exUXIWZtJW+cxuRwDoBIcSGWRwHWmkDc5k13kLaW/BcdWAfI/yFEkAwzrO1AfQOsB1qdbfYle9pP724BebfQHlqAxH9zNWlQdek+Gr02WKKXMWWhl2bH4P2QbNQItD5X6+xQTbnbmZnUECap9mQXbCzPVNU2MwvPRLuYuJmjcNBdC39iGfZNBY/+N1Ix3y6yFa41VD773KiqTZhVOM1TvVJz/lb+Dm25qSZdKixC0987eDY5zHiCigHIjJxo1bDwJz4xJ/DsnIo+hk0LvrOPvoxBp6tFNhGQgIUkwk0Lz6FsNQcH5l5QLh1ROq4isNx9BVEOHb+W1PdFzFlvoKf9+WS/ysSw19B/GFhtLJGTmGkaxnEBxhJ+DyiVnV5APV+cE4AEA4yB/Vz7cKOrBlLbZdZFb8x9DtHamKvyoZh7RVun6BHSmMNAlPD83oxF9HZ7GjhKeC1EpvIdSrZAh6NKgklt0slwSumWU6VfJeoT4STNfiP39DzHHtWqscwTTAG9Rp4UFxDRsz6jCWaPf7AfYe85fXp+EwBRC0RYikQz43IFnKoGpz69qNh4vap6HNPQmM2uctZeWbhtDSq2FzN5fbheSV5QlFeq88O4S8= +language: node_js +node_js: node +addons: + chrome: stable +script: +- npm run 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=date-picker + - SAUCE_USERNAME: Desire2Learn + - secure: R9nrpeyuMcZTHnBcVAuMn+q/Fp9ti9K31tYlkBFhXtJc+rM/TYERiN195SRgbk2Gy6fK4exUXIWZtJW+cxuRwDoBIcSGWRwHWmkDc5k13kLaW/BcdWAfI/yFEkAwzrO1AfQOsB1qdbfYle9pP724BebfQHlqAxH9zNWlQdek+Gr02WKKXMWWhl2bH4P2QbNQItD5X6+xQTbnbmZnUECap9mQXbCzPVNU2MwvPRLuYuJmjcNBdC39iGfZNBY/+N1Ix3y6yFa41VD773KiqTZhVOM1TvVJz/lb+Dm25qSZdKixC0987eDY5zHiCigHIjJxo1bDwJz4xJ/DsnIo+hk0LvrOPvoxBp6tFNhGQgIUkwk0Lz6FsNQcH5l5QLh1ROq4isNx9BVEOHb+W1PdFzFlvoKf9+WS/ysSw19B/GFhtLJGTmGkaxnEBxhJ+DyiVnV5APV+cE4AEA4yB/Vz7cKOrBlLbZdZFb8x9DtHamKvyoZh7RVun6BHSmMNAlPD83oxF9HZ7GjhKeC1EpvIdSrZAh6NKgklt0slwSumWU6VfJeoT4STNfiP39DzHHtWqscwTTAG9Rp4UFxDRsz6jCWaPf7AfYe85fXp+EwBRC0RYikQz43IFnKoGpz69qNh4vap6HNPQmM2uctZeWbhtDSq2FzN5fbheSV5QlFeq88O4S8= + - secure: utqcw6fLXPXCIoX/oXDM6BQhH5v+43hrBkvnVeuK/v+7FoeqwHmNev3KDKUWXR07UUXP9tr68iudYbbDXHlay3W3SlKe3EXVo3+kwPzXa4n0eFUX6My8hOVqU2QFQZZuQUsPLw6R8d+xOsYckua/2CO5k/3LDE+wWUSgWDP5a7YyNZCdfRa2kK1f43XEkTqVBVIrz93t4qYqiRABJRh6RwRabdLLOpGsoJWV8dP7e68C3y2m8uAgBtnTN9qfpSE4inuQCGdolKe/C6pzh0tf73V37QJzKAVD8MvDe4yNNdw0aiRr32VHIqX03QnN7kdaOFlFmKF1BTgWB1cnPmlXnxTaNI+Izi0AvR5ObhgU+aCpuITI35m1yQqD+rW9qEZMi5bPykrhdYYVmCcVfRchlDyFrSc4mHLfcA871ER1Fu2Bydxl/tqJDKaNwnsfzHoieWRTsk/XHspfjLxpa1Va7ke2waR56gCGqmXoIK9Kx8qUhpuoICxDfbMyyNef7o/UFRJBDB0jVe4NP2ifOfZLXAPPw69Lorx91Viw5d57SOmeBwEKH+n7S34j1cWk9Wjjt5zRabTwJw7z5TD71aI5Sw2IHuFOlh9YPGhXGGbVmgo1uq8h0Zz2Qswmev016C120NquP+qD8ENaKnQsB5AEh87bZJl4nqga1fD+yNQheWA= diff --git a/README.md b/README.md index 10986fb..1b7749c 100644 --- a/README.md +++ b/README.md @@ -50,3 +50,12 @@ Allows the user to provide the `--vaadin-date-picker-overlay` mixin when set to ## Overriding the date format This repository uses https://github.com/BrightspaceUI/localize-behavior for formatting dates, if you need to override the date format, look there for instructions. + +## 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 d0cc0db..688ebb8 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "eslint": "^4.18.1", "eslint-config-brightspace": "^0.4.1", "eslint-plugin-html": "^4.0.2", + "frau-ci": "^1.33.2", "lodash": "^3.10.1", "polymer-cli": "^1.9.4", "wct-browser-legacy": "^1.0.2" From ab307c916df12f5074fbb31fe7b5e8c9455b6556 Mon Sep 17 00:00:00 2001 From: Martin Bayly Date: Sun, 17 Feb 2019 14:43:09 -0800 Subject: [PATCH 3/7] 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 20cfd6b..f62f963 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,31 +1,31 @@ -language: node_js -node_js: node -addons: - chrome: stable -script: -- npm run 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=date-picker - - SAUCE_USERNAME: Desire2Learn - - secure: R9nrpeyuMcZTHnBcVAuMn+q/Fp9ti9K31tYlkBFhXtJc+rM/TYERiN195SRgbk2Gy6fK4exUXIWZtJW+cxuRwDoBIcSGWRwHWmkDc5k13kLaW/BcdWAfI/yFEkAwzrO1AfQOsB1qdbfYle9pP724BebfQHlqAxH9zNWlQdek+Gr02WKKXMWWhl2bH4P2QbNQItD5X6+xQTbnbmZnUECap9mQXbCzPVNU2MwvPRLuYuJmjcNBdC39iGfZNBY/+N1Ix3y6yFa41VD773KiqTZhVOM1TvVJz/lb+Dm25qSZdKixC0987eDY5zHiCigHIjJxo1bDwJz4xJ/DsnIo+hk0LvrOPvoxBp6tFNhGQgIUkwk0Lz6FsNQcH5l5QLh1ROq4isNx9BVEOHb+W1PdFzFlvoKf9+WS/ysSw19B/GFhtLJGTmGkaxnEBxhJ+DyiVnV5APV+cE4AEA4yB/Vz7cKOrBlLbZdZFb8x9DtHamKvyoZh7RVun6BHSmMNAlPD83oxF9HZ7GjhKeC1EpvIdSrZAh6NKgklt0slwSumWU6VfJeoT4STNfiP39DzHHtWqscwTTAG9Rp4UFxDRsz6jCWaPf7AfYe85fXp+EwBRC0RYikQz43IFnKoGpz69qNh4vap6HNPQmM2uctZeWbhtDSq2FzN5fbheSV5QlFeq88O4S8= - - secure: utqcw6fLXPXCIoX/oXDM6BQhH5v+43hrBkvnVeuK/v+7FoeqwHmNev3KDKUWXR07UUXP9tr68iudYbbDXHlay3W3SlKe3EXVo3+kwPzXa4n0eFUX6My8hOVqU2QFQZZuQUsPLw6R8d+xOsYckua/2CO5k/3LDE+wWUSgWDP5a7YyNZCdfRa2kK1f43XEkTqVBVIrz93t4qYqiRABJRh6RwRabdLLOpGsoJWV8dP7e68C3y2m8uAgBtnTN9qfpSE4inuQCGdolKe/C6pzh0tf73V37QJzKAVD8MvDe4yNNdw0aiRr32VHIqX03QnN7kdaOFlFmKF1BTgWB1cnPmlXnxTaNI+Izi0AvR5ObhgU+aCpuITI35m1yQqD+rW9qEZMi5bPykrhdYYVmCcVfRchlDyFrSc4mHLfcA871ER1Fu2Bydxl/tqJDKaNwnsfzHoieWRTsk/XHspfjLxpa1Va7ke2waR56gCGqmXoIK9Kx8qUhpuoICxDfbMyyNef7o/UFRJBDB0jVe4NP2ifOfZLXAPPw69Lorx91Viw5d57SOmeBwEKH+n7S34j1cWk9Wjjt5zRabTwJw7z5TD71aI5Sw2IHuFOlh9YPGhXGGbVmgo1uq8h0Zz2Qswmev016C120NquP+qD8ENaKnQsB5AEh87bZJl4nqga1fD+yNQheWA= +language: node_js +node_js: node +addons: + chrome: stable +script: +- npm run 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=date-picker + - SAUCE_USERNAME: Desire2Learn + - secure: R9nrpeyuMcZTHnBcVAuMn+q/Fp9ti9K31tYlkBFhXtJc+rM/TYERiN195SRgbk2Gy6fK4exUXIWZtJW+cxuRwDoBIcSGWRwHWmkDc5k13kLaW/BcdWAfI/yFEkAwzrO1AfQOsB1qdbfYle9pP724BebfQHlqAxH9zNWlQdek+Gr02WKKXMWWhl2bH4P2QbNQItD5X6+xQTbnbmZnUECap9mQXbCzPVNU2MwvPRLuYuJmjcNBdC39iGfZNBY/+N1Ix3y6yFa41VD773KiqTZhVOM1TvVJz/lb+Dm25qSZdKixC0987eDY5zHiCigHIjJxo1bDwJz4xJ/DsnIo+hk0LvrOPvoxBp6tFNhGQgIUkwk0Lz6FsNQcH5l5QLh1ROq4isNx9BVEOHb+W1PdFzFlvoKf9+WS/ysSw19B/GFhtLJGTmGkaxnEBxhJ+DyiVnV5APV+cE4AEA4yB/Vz7cKOrBlLbZdZFb8x9DtHamKvyoZh7RVun6BHSmMNAlPD83oxF9HZ7GjhKeC1EpvIdSrZAh6NKgklt0slwSumWU6VfJeoT4STNfiP39DzHHtWqscwTTAG9Rp4UFxDRsz6jCWaPf7AfYe85fXp+EwBRC0RYikQz43IFnKoGpz69qNh4vap6HNPQmM2uctZeWbhtDSq2FzN5fbheSV5QlFeq88O4S8= + - secure: utqcw6fLXPXCIoX/oXDM6BQhH5v+43hrBkvnVeuK/v+7FoeqwHmNev3KDKUWXR07UUXP9tr68iudYbbDXHlay3W3SlKe3EXVo3+kwPzXa4n0eFUX6My8hOVqU2QFQZZuQUsPLw6R8d+xOsYckua/2CO5k/3LDE+wWUSgWDP5a7YyNZCdfRa2kK1f43XEkTqVBVIrz93t4qYqiRABJRh6RwRabdLLOpGsoJWV8dP7e68C3y2m8uAgBtnTN9qfpSE4inuQCGdolKe/C6pzh0tf73V37QJzKAVD8MvDe4yNNdw0aiRr32VHIqX03QnN7kdaOFlFmKF1BTgWB1cnPmlXnxTaNI+Izi0AvR5ObhgU+aCpuITI35m1yQqD+rW9qEZMi5bPykrhdYYVmCcVfRchlDyFrSc4mHLfcA871ER1Fu2Bydxl/tqJDKaNwnsfzHoieWRTsk/XHspfjLxpa1Va7ke2waR56gCGqmXoIK9Kx8qUhpuoICxDfbMyyNef7o/UFRJBDB0jVe4NP2ifOfZLXAPPw69Lorx91Viw5d57SOmeBwEKH+n7S34j1cWk9Wjjt5zRabTwJw7z5TD71aI5Sw2IHuFOlh9YPGhXGGbVmgo1uq8h0Zz2Qswmev016C120NquP+qD8ENaKnQsB5AEh87bZJl4nqga1fD+yNQheWA= From 7e8c4815902bb7cb36b21119a5d34f161966353d Mon Sep 17 00:00:00 2001 From: Martin Bayly Date: Sun, 17 Feb 2019 14:55:22 -0800 Subject: [PATCH 4/7] 2.0.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 688ebb8..f611d72 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "polymer-cli": "^1.9.4", "wct-browser-legacy": "^1.0.2" }, - "version": "2.0.2", + "version": "2.0.4", "dependencies": { "@polymer/iron-a11y-keys": "^3.0.1", "@polymer/iron-dropdown": "^3.0.1", From 35aff03c7e780e48ecb5d9f1f793c8615912e948 Mon Sep 17 00:00:00 2001 From: Martin Bayly Date: Mon, 1 Apr 2019 17:37:45 -0700 Subject: [PATCH 5/7] 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 f62f963..fc609d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,7 @@ deploy: tags: true env: global: + - OWNER_NAME=BrightspaceUI - REPO_NAME=date-picker - SAUCE_USERNAME: Desire2Learn - secure: R9nrpeyuMcZTHnBcVAuMn+q/Fp9ti9K31tYlkBFhXtJc+rM/TYERiN195SRgbk2Gy6fK4exUXIWZtJW+cxuRwDoBIcSGWRwHWmkDc5k13kLaW/BcdWAfI/yFEkAwzrO1AfQOsB1qdbfYle9pP724BebfQHlqAxH9zNWlQdek+Gr02WKKXMWWhl2bH4P2QbNQItD5X6+xQTbnbmZnUECap9mQXbCzPVNU2MwvPRLuYuJmjcNBdC39iGfZNBY/+N1Ix3y6yFa41VD773KiqTZhVOM1TvVJz/lb+Dm25qSZdKixC0987eDY5zHiCigHIjJxo1bDwJz4xJ/DsnIo+hk0LvrOPvoxBp6tFNhGQgIUkwk0Lz6FsNQcH5l5QLh1ROq4isNx9BVEOHb+W1PdFzFlvoKf9+WS/ysSw19B/GFhtLJGTmGkaxnEBxhJ+DyiVnV5APV+cE4AEA4yB/Vz7cKOrBlLbZdZFb8x9DtHamKvyoZh7RVun6BHSmMNAlPD83oxF9HZ7GjhKeC1EpvIdSrZAh6NKgklt0slwSumWU6VfJeoT4STNfiP39DzHHtWqscwTTAG9Rp4UFxDRsz6jCWaPf7AfYe85fXp+EwBRC0RYikQz43IFnKoGpz69qNh4vap6HNPQmM2uctZeWbhtDSq2FzN5fbheSV5QlFeq88O4S8= From 047709b893816006afbc972d91e2c3ef8091061d Mon Sep 17 00:00:00 2001 From: Martin Bayly Date: Tue, 2 Apr 2019 09:20:06 -0700 Subject: [PATCH 6/7] 2.0.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f611d72..99be647 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "polymer-cli": "^1.9.4", "wct-browser-legacy": "^1.0.2" }, - "version": "2.0.4", + "version": "2.0.5", "dependencies": { "@polymer/iron-a11y-keys": "^3.0.1", "@polymer/iron-dropdown": "^3.0.1", From b3b61e4cd8dd023e9578dade0a14601f160cae7a Mon Sep 17 00:00:00 2001 From: Martin Bayly Date: Wed, 10 Apr 2019 12:02:14 -0700 Subject: [PATCH 7/7] 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 fc609d7..97378e0 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)