Release: Put back plugin-e2e 0.9.0 and cleanup changelogs (#675)

grafana · Jan 18, 2024 · 170be89 · 170be89
1 parent 4877a2c
commit 170be89
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 88 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,95 +1,46 @@
-# (Wed Jan 17 2024)
-
-:tada: This release contains work from a new contributor! :tada:
-
-Thank you, Sam Jewell ([@samjewell](https://github.com/samjewell)), for all your work!
+# (Tue Jan 16 2024)
 
 #### 💥 Breaking Change
 
-- `@grafana/sign-plugin@4.0.0`
+- `@grafana/sign-plugin@3.0.0`
   - Build: Migrate sign-plugin to ESM [#662](https://github.com/grafana/plugin-tools/pull/662) ([@jackw](https://github.com/jackw))
 
-#### 🚀 Enhancement
-
-- `@grafana/[email protected]`
-  - Plugin E2E: Use node16 [#670](https://github.com/grafana/plugin-tools/pull/670) ([@sunker](https://github.com/sunker))
-- `@grafana/[email protected]`
-  - Use `custom.ini` file provided to configure Grafana docker container [#660](https://github.com/grafana/plugin-tools/pull/660) ([@samjewell](https://github.com/samjewell))
-
-#### 🐛 Bug Fix
-
-- `@grafana/[email protected]`
-  - Plugin E2E: Update changed selector [#672](https://github.com/grafana/plugin-tools/pull/672) ([@sunker](https://github.com/sunker))
-
-#### 🔩 Dependency Updates
-
-- Chore(deps-dev): Bump nodemon from 3.0.1 to 3.0.2 [#667](https://github.com/grafana/plugin-tools/pull/667) ([@dependabot[bot]](https://github.com/dependabot[bot]))
-- Chore(deps-dev): Bump @swc/jest from 0.2.20 to 0.2.29 [#668](https://github.com/grafana/plugin-tools/pull/668) ([@dependabot[bot]](https://github.com/dependabot[bot]))
-
-#### Authors: 4
+#### Authors: 1
 
-- [@dependabot[bot]](https://github.com/dependabot[bot])
-- Erik Sundell ([@sunker](https://github.com/sunker))
 - Jack Westbrook ([@jackw](https://github.com/jackw))
-- Sam Jewell ([@samjewell](https://github.com/samjewell))
 
 ---
 
 # (Tue Jan 16 2024)
 
-:tada: This release contains work from a new contributor! :tada:
-
-Thank you, Sam Jewell ([@samjewell](https://github.com/samjewell)), for all your work!
-
-#### 💥 Breaking Change
-
-- `@grafana/[email protected]`
-  - Build: Migrate sign-plugin to ESM [#662](https://github.com/grafana/plugin-tools/pull/662) ([@jackw](https://github.com/jackw))
-
-#### 🚀 Enhancement
-
-- `@grafana/[email protected]`
-  - Plugin E2E: Use node16 [#670](https://github.com/grafana/plugin-tools/pull/670) ([@sunker](https://github.com/sunker))
-- `@grafana/[email protected]`
-  - Use `custom.ini` file provided to configure Grafana docker container [#660](https://github.com/grafana/plugin-tools/pull/660) ([@samjewell](https://github.com/samjewell))
-
 #### 🔩 Dependency Updates
 
-- Chore(deps-dev): Bump nodemon from 3.0.1 to 3.0.2 [#667](https://github.com/grafana/plugin-tools/pull/667) ([@dependabot[bot]](https://github.com/dependabot[bot]))
-- Chore(deps-dev): Bump @swc/jest from 0.2.20 to 0.2.29 [#668](https://github.com/grafana/plugin-tools/pull/668) ([@dependabot[bot]](https://github.com/dependabot[bot]))
+- `@grafana/[email protected]`
+  - Chore(deps-dev): Bump nodemon from 3.0.1 to 3.0.2 [#667](https://github.com/grafana/plugin-tools/pull/667) ([@dependabot[bot]](https://github.com/dependabot[bot]))
+  - Chore(deps-dev): Bump @swc/jest from 0.2.20 to 0.2.29 [#668](https://github.com/grafana/plugin-tools/pull/668) ([@dependabot[bot]](https://github.com/dependabot[bot]))
 
-#### Authors: 4
+#### Authors: 1
 
 - [@dependabot[bot]](https://github.com/dependabot[bot])
-- Erik Sundell ([@sunker](https://github.com/sunker))
-- Jack Westbrook ([@jackw](https://github.com/jackw))
-- Sam Jewell ([@samjewell](https://github.com/samjewell))
 
 ---
 
 # (Tue Jan 16 2024)
 
-:tada: This release contains work from a new contributor! :tada:
-
-Thank you, Sam Jewell ([@samjewell](https://github.com/samjewell)), for all your work!
-
 #### 🚀 Enhancement
 
 - `@grafana/[email protected]`
   - Plugin E2E: Use node16 [#670](https://github.com/grafana/plugin-tools/pull/670) ([@sunker](https://github.com/sunker))
-- `@grafana/[email protected]`
-  - Use `custom.ini` file provided to configure Grafana docker container [#660](https://github.com/grafana/plugin-tools/pull/660) ([@samjewell](https://github.com/samjewell))
 
 #### 🔩 Dependency Updates
 
 - Chore(deps-dev): Bump nodemon from 3.0.1 to 3.0.2 [#667](https://github.com/grafana/plugin-tools/pull/667) ([@dependabot[bot]](https://github.com/dependabot[bot]))
 - Chore(deps-dev): Bump @swc/jest from 0.2.20 to 0.2.29 [#668](https://github.com/grafana/plugin-tools/pull/668) ([@dependabot[bot]](https://github.com/dependabot[bot]))
 
-#### Authors: 3
+#### Authors: 2
 
 - [@dependabot[bot]](https://github.com/dependabot[bot])
 - Erik Sundell ([@sunker](https://github.com/sunker))
-- Sam Jewell ([@samjewell](https://github.com/samjewell))
 
 ---
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -162,18 +162,18 @@ When opening a PR please attach the necessary label for the change so releases a
 - **major** -> 💥 Breaking Change
 - **minor** -> 🚀 Enhancement
 - **patch** -> 🐛 Bug Fix
+- **no-changelog** -> 🙈 Don't impact versioning.
 
-Also bear in mind not every PR needs to make a version bump to a package. Please be mindful when labelling PRs.
+If you would like the PR to automatically publish a new release of a package when merged you should also add the `release` label to the PR. This is done using the [`onlyPublishWithReleaseLabel`](https://intuit.github.io/auto/docs/configuration/autorc#only-publish-with-release-label) flag to allow us greater control on when a release occurs.
 
-By default Auto creates a release for every PR that is merged to `main`. However this repo makes use of the [`onlyPublishWithReleaseLabel`](https://intuit.github.io/auto/docs/configuration/autorc#only-publish-with-release-label) flag to allow us greater control on when a release occurs. To make an actual release a PR needs to also have the `release` label attached.
+Bear in mind not every PR needs to make a version bump to a package. Please be mindful when labelling PRs.
 
-When a release occurs a github workflow will run `yarn release` which in turn calls `auto shipit`. This command does the following things:
+When a merge to the `main` branch occurs a github workflow will run `npm run release` which in turn calls `auto shipit`. The `auto shipit` command does the following things:
 
-1. Calculate version bumps 🧮
-2. Independently bump package versions (based on labels of previously unreleased packages) 📦
-3. Update CHANGELOG.md for each package (where necessary) 📚
-4. Update contributors section of README.md (where necessary) 📚
-5. Commit changes and tag the repository 📌
-6. Create github release 📄
-7. Publish packages to NPM 🚀
-8. Push changes to repo ➡️
+1. **Check for 'release' Label**: 🔍 The command only triggers version bumps if the merged PR has a 'release' label.
+1. **Version Calculation**: 🧮 Determines the appropriate version bump per package by analyzing the labels of merged PRs since the last GH release.
+1. **Changelog Updates**: 📝 The command updates the CHANGELOG.md for affected packages and possibly the root CHANGELOG.md.
+1. **Commit and Tag**: 🏷️ It commits these changes and tags the repository.
+1. **GitHub Release Creation**: 📄 Creates a GitHub release for the new version.
+1. **NPM Publishing**: 🚀 If the conditions are met (e.g., 'release' label present), it publishes the packages to NPM.
+1. **Push Changes and Tags**: ⬆️ Finally, it pushes these changes and tags back to the repository.
diff --git a/packages/plugin-e2e/CHANGELOG.md b/packages/plugin-e2e/CHANGELOG.md
@@ -1,22 +1,3 @@
-# v1.0.0 (Wed Jan 17 2024)
-
-#### 🚀 Enhancement
-
-- Plugin E2E: Use node16 [#670](https://github.com/grafana/plugin-tools/pull/670) ([@sunker](https://github.com/sunker))
-
-#### 🐛 Bug Fix
-
-- Plugin E2E: Update changed selector [#672](https://github.com/grafana/plugin-tools/pull/672) ([@sunker](https://github.com/sunker))
-- "Bump independent versions \[skip ci\]" ([@grafanabot](https://github.com/grafanabot))
-- Update CHANGELOG.md \[skip ci\] ([@grafanabot](https://github.com/grafanabot))
-
-#### Authors: 2
-
-- Erik Sundell ([@sunker](https://github.com/sunker))
-- Grot (@grafanabot) ([@grafanabot](https://github.com/grafanabot))
-
----
-
 # v0.9.0 (Tue Jan 16 2024)
 
 #### 🚀 Enhancement

diff --git a/packages/plugin-e2e/package.json b/packages/plugin-e2e/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grafana/plugin-e2e",
-  "version": "1.0.0",
+  "version": "0.9.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [