From 65e9c4fa40801529c59decdfb3b3bb063a821940 Mon Sep 17 00:00:00 2001 From: Jacob Bolda Date: Mon, 15 Jun 2020 08:29:22 -0500 Subject: [PATCH] feature: implement version change PR (#676) * update readme with notes about character limits and designating bumps * edit PR template to note addition of a change file * add change file for #674 * add change file for #673 * add change file for #672 * add change file for #671 * add version action * set version command in config * add change file for #677 * add labels to PRs * Update .changes/tauri-info-crash.md Co-authored-by: Rajiv Shah * Update .changes/HttpRequestBuilder-implementation.md Co-authored-by: Rajiv Shah * Update kill-beforeDevProcess-on-shutdown.md * Update reflect-conf-changes.md Co-authored-by: Rajiv Shah Co-authored-by: Lucas Fernandes Nogueira --- .changes/HttpRequestBuilder-implementation.md | 5 +++ .changes/config.json | 2 ++ .changes/kill-beforeDevProcess-on-shutdown.md | 5 +++ .changes/readme.md | 12 +++++++ .changes/reflect-conf-changes.md | 6 ++++ .changes/tauri-hot-reload-regression.md | 5 +++ .changes/tauri-info-crash.md | 5 +++ .github/PULL_REQUEST_TEMPLATE.md | 1 + .github/workflows/pr-to-master.yml | 1 + .github/workflows/pr-version-updates.yml | 32 +++++++++++++++++++ 10 files changed, 74 insertions(+) create mode 100644 .changes/HttpRequestBuilder-implementation.md create mode 100644 .changes/kill-beforeDevProcess-on-shutdown.md create mode 100644 .changes/reflect-conf-changes.md create mode 100644 .changes/tauri-hot-reload-regression.md create mode 100644 .changes/tauri-info-crash.md create mode 100644 .github/workflows/pr-version-updates.yml diff --git a/.changes/HttpRequestBuilder-implementation.md b/.changes/HttpRequestBuilder-implementation.md new file mode 100644 index 000000000..2bcd4b15f --- /dev/null +++ b/.changes/HttpRequestBuilder-implementation.md @@ -0,0 +1,5 @@ +--- +"tauri-api": minor +--- + +This adds HttpRequestBuilder, described at "alternatives you've considered" section in [#651](https://github.com/tauri-apps/tauri/issues/651). diff --git a/.changes/config.json b/.changes/config.json index b818e61cc..53255bd53 100644 --- a/.changes/config.json +++ b/.changes/config.json @@ -1,9 +1,11 @@ { "pkgManagers": { "rust": { + "version": true, "publish": false }, "javascript": { + "version": true, "publish": false } }, diff --git a/.changes/kill-beforeDevProcess-on-shutdown.md b/.changes/kill-beforeDevProcess-on-shutdown.md new file mode 100644 index 000000000..a13e66d97 --- /dev/null +++ b/.changes/kill-beforeDevProcess-on-shutdown.md @@ -0,0 +1,5 @@ +--- +"tauri.js": patch +--- + +Kill process started by `tauri.conf.json > build > beforeDevCommand` on CLI shutdown. diff --git a/.changes/readme.md b/.changes/readme.md index 1e50f6fcf..b5c0ba9cd 100644 --- a/.changes/readme.md +++ b/.changes/readme.md @@ -15,3 +15,15 @@ Use the following format: Change summary goes here ``` + +Summaries do not have a specific character limit, but are text only. These summaries are used within the (future implementation of) changelogs. They will give context to the change and also point back to the original PR if more details and context are needed. + +Changes will be designated as a `major`, `minor` or `patch` as further described in [semver](https://semver.org/). + +Given a version number MAJOR.MINOR.PATCH, increment the: + +- MAJOR version when you make incompatible API changes, +- MINOR version when you add functionality in a backwards compatible manner, and +- PATCH version when you make backwards compatible bug fixes. + +Additional labels for pre-release and build metadata are available as extensions to the MAJOR.MINOR.PATCH format, but will be discussed prior to usage (as extra steps will be necessary in consideration of merging and publishing). diff --git a/.changes/reflect-conf-changes.md b/.changes/reflect-conf-changes.md new file mode 100644 index 000000000..5d1cf1242 --- /dev/null +++ b/.changes/reflect-conf-changes.md @@ -0,0 +1,6 @@ +--- +"tauri.js": patch +"tauri": patch +--- + +Properly reflect tauri.conf.json changes on app when running `tauri dev`. diff --git a/.changes/tauri-hot-reload-regression.md b/.changes/tauri-hot-reload-regression.md new file mode 100644 index 000000000..893f4bde3 --- /dev/null +++ b/.changes/tauri-hot-reload-regression.md @@ -0,0 +1,5 @@ +--- +"tauri.js": patch +--- + +Fixes regression on hot reload when Rust doesn't compile. diff --git a/.changes/tauri-info-crash.md b/.changes/tauri-info-crash.md new file mode 100644 index 000000000..4d987cea6 --- /dev/null +++ b/.changes/tauri-info-crash.md @@ -0,0 +1,5 @@ +--- +"tauri.js": patch +--- + +Fixes the case when `tauri info` is run and a project has not yet created a `Cargo.lock` closing [#610](https://github.com/tauri-apps/tauri/issues/610). diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index ab3e42c32..9571d3d96 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -32,6 +32,7 @@ If yes, please describe the impact and migration path for existing applications - [ ] It's submitted to the `dev` branch and _not_ the `master` branch - [ ] When resolving a specific issue, it's referenced in the PR's title (e.g. `fix: #xxx[,#xxx]`, where "xxx" is the issue number) +- [ ] A change file is added if any packages will require a version bump due to this PR per [the instructions in the readme](https://github.com/tauri-apps/tauri/blob/dev/.changes/readme.md). If adding a **new feature**, the PR's description includes: - [ ] A convincing reason for adding this feature (to avoid wasting your time, it's best to open a suggestion issue first and wait for approval before working on it) diff --git a/.github/workflows/pr-to-master.yml b/.github/workflows/pr-to-master.yml index f0ae7eb48..650f78312 100644 --- a/.github/workflows/pr-to-master.yml +++ b/.github/workflows/pr-to-master.yml @@ -27,6 +27,7 @@ jobs: branch: release/master branch-suffix: short-commit-hash title: Publish + labels: "publish" body: | Merging this PR will squash and push all changes to the master branch. It will kick off the process to release and publish any packages with an incremented version number. diff --git a/.github/workflows/pr-version-updates.yml b/.github/workflows/pr-version-updates.yml new file mode 100644 index 000000000..038e22eee --- /dev/null +++ b/.github/workflows/pr-version-updates.yml @@ -0,0 +1,32 @@ +name: pr-version-updates + +on: + push: + branches: + - dev + +jobs: + pr-to-master: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: git config + run: | + git config --global user.name "${{ github.event.pusher.name }}" + git config --global user.email "${{ github.event.pusher.email }}" + - name: covector version + uses: jbolda/covector/packages/action@master + id: covector + with: + command: 'version' + - name: Create Pull Request With Versions Bumped + uses: tauri-apps/create-pull-request@v2.8.0 + with: + token: ${{ secrets.GITHUB_TOKEN }} + branch: release/version-updates + title: Apply Version Updates From Current Changes + labels: "version updates" + body: | + Merging this PR will update the versions on all packages with changes as specified in the `.changes` directory. + It will kick off the process to release and publish any packages with an incremented version number.