Skip to content

Commit d8413a1

Browse files
committed
Merge branch 'release/0.2.8'
2 parents 2f1c4bc + fa7af64 commit d8413a1

File tree

10 files changed

+1815
-2041
lines changed

10 files changed

+1815
-2041
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.github/workflows/build.yml renamed to .github/workflows/build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1414

1515
- name: Install pnpm
16-
uses: pnpm/action-setup@v4
16+
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
1717
with:
1818
version: 9
1919
run_install: true
2020

2121
- name: Install Node.js
22-
uses: actions/setup-node@v4
22+
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
2323
with:
2424
node-version: "22"
2525
cache: pnpm

.github/workflows/publish.yaml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Publish to NPM
2+
on:
3+
release:
4+
types: [published]
5+
6+
jobs:
7+
npm-publish:
8+
runs-on: ubuntu-latest
9+
permissions:
10+
contents: read
11+
id-token: write
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
15+
16+
- name: Install pnpm
17+
uses: pnpm/action-setup@v4
18+
with:
19+
version: 9
20+
run_install: true
21+
22+
- name: Install Node.js
23+
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
24+
with:
25+
node-version: "22"
26+
cache: pnpm
27+
registry-url: "https://registry.npmjs.org"
28+
29+
- name: Build package
30+
run: pnpm run build
31+
32+
- name: Publish package to npm
33+
run: pnpm publish --no-git-checks
34+
env:
35+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
36+
NPM_CONFIG_PROVENANCE: true

.github/workflows/release.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: GitHub Release
2+
on:
3+
push:
4+
tags:
5+
- "*"
6+
7+
jobs:
8+
create-release:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Checkout
12+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
13+
14+
- name: Generate Changelog
15+
id: release_notes
16+
uses: yashanand1910/standard-release-notes@28752849855b451d0d2bee11a83a4da2d794ecf6 # v1.5.0
17+
with:
18+
version: ${{ github.ref }}
19+
20+
- name: Create GitHub Release
21+
uses: softprops/action-gh-release@62c96d0c4e8a889135c1f3a25910db8dbe0e85f7 # v2.3.4
22+
with:
23+
tag_name: ${{ github.ref_name }}
24+
body: ${{ steps.release_notes.outputs.release_notes }}
25+
draft: true

.release-it.json

Lines changed: 0 additions & 27 deletions
This file was deleted.

.versionrc.cjs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
module.exports = {
2+
tagPrefix: "",
3+
writerOpts: {
4+
finalizeContext(context) {
5+
if (!context.commitGroups?.length) {
6+
context.commitGroups = [{ commits: [{ header: "No significant changes" }] }];
7+
}
8+
return context;
9+
}
10+
}
11+
};

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
4+
5+
## 0.2.8 (2025-10-07)
6+
7+
8+
* No significant changes
9+
310
## [0.2.7](https://github.com/VChet/git-merged-branches/compare/0.2.6...0.2.7) (2025-08-27)
411

512
### Bug Fixes

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# git-merged-branches
22

3-
[![npm version][npm-version-src]][npm-version-href]
4-
[![npm downloads][npm-downloads-src]][npm-downloads-href]
5-
[![build][build-src]][build-href]
6-
[![ask DeepWiki][deep-wiki-src]][deep-wiki-href]
3+
[![npm version][npm-version-img]][npm-version-href]
4+
[![npm downloads][npm-downloads-img]][npm-downloads-href]
5+
[![build][build-img]][build-href]
6+
[![ask DeepWiki][deep-wiki-img]][deep-wiki-href]
77

88
**git-merged-branches is a command-line utility to view branches merged into a selected base branch (e.g., master or main).**
99

@@ -122,11 +122,11 @@ feel free to [contribute](https://github.com/VChet/git-merged-branches/pulls)
122122
or report [issues](https://github.com/VChet/git-merged-branches/issues).
123123

124124
<!-- Badges -->
125-
[npm-version-src]: https://img.shields.io/npm/v/git-merged-branches?style=flat-square
125+
[npm-version-img]: https://img.shields.io/npm/v/git-merged-branches?style=flat-square
126126
[npm-version-href]: https://npmjs.com/package/git-merged-branches
127-
[npm-downloads-src]: https://img.shields.io/npm/dm/git-merged-branches?style=flat-square
127+
[npm-downloads-img]: https://img.shields.io/npm/dm/git-merged-branches?style=flat-square
128128
[npm-downloads-href]: https://npmjs.com/package/git-merged-branches
129-
[build-src]: https://img.shields.io/github/actions/workflow/status/VChet/git-merged-branches/build.yml?style=flat-square
129+
[build-img]: https://img.shields.io/github/actions/workflow/status/VChet/git-merged-branches/build.yml?style=flat-square
130130
[build-href]: https://github.com/VChet/git-merged-branches/actions/workflows/build.yml
131-
[deep-wiki-src]: https://img.shields.io/badge/ask-DeepWiki-blue?style=flat-square
131+
[deep-wiki-img]: https://img.shields.io/badge/ask-DeepWiki-blue?style=flat-square
132132
[deep-wiki-href]: https://deepwiki.com/VChet/git-merged-branches

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"issue-tracker"
99
],
1010
"type": "module",
11-
"version": "0.2.7",
11+
"version": "0.2.8",
1212
"license": "MIT",
1313
"author": {
1414
"name": "VChet",
@@ -38,19 +38,16 @@
3838
"lint:js:fix": "npm run lint:js -- --fix",
3939
"lint:all": "npm run lint:ts && npm run lint:js",
4040
"test": "vitest --run",
41-
"release:patch": "dotenv release-it patch",
42-
"release:minor": "dotenv release-it minor",
43-
"release:major": "dotenv release-it major"
41+
"release": "npm run lint:all && npm run test && commit-and-tag-version"
4442
},
4543
"devDependencies": {
46-
"@release-it/conventional-changelog": "^10.0.1",
47-
"@types/node": "^24.3.0",
44+
"@types/node": "^24.7.0",
45+
"commit-and-tag-version": "^12.6.0",
4846
"dotenv-cli": "^10.0.0",
49-
"esbuild": "^0.25.9",
50-
"eslint": "^9.34.0",
47+
"esbuild": "^0.25.10",
48+
"eslint": "^9.37.0",
5149
"neostandard": "^0.12.2",
52-
"release-it": "^19.0.4",
53-
"typescript": "^5.9.2",
50+
"typescript": "^5.9.3",
5451
"vitest": "^3.2.4"
5552
},
5653
"pnpm": {
@@ -61,15 +58,18 @@
6158
"array.prototype.flatmap": "npm:@nolyfill/array.prototype.flatmap@^1",
6259
"array.prototype.tosorted": "npm:@nolyfill/array.prototype.tosorted@^1",
6360
"es-iterator-helpers": "npm:@nolyfill/es-iterator-helpers@^1",
61+
"es-set-tostringtag": "npm:@nolyfill/es-set-tostringtag@^1",
6462
"hasown": "npm:@nolyfill/hasown@^1",
6563
"is-core-module": "npm:@nolyfill/is-core-module@^1",
64+
"isarray": "npm:@nolyfill/isarray@^1",
6665
"object.assign": "npm:@nolyfill/object.assign@^1",
6766
"object.entries": "npm:@nolyfill/object.entries@^1",
6867
"object.fromentries": "npm:@nolyfill/object.fromentries@^1",
6968
"object.values": "npm:@nolyfill/object.values@^1",
7069
"safe-buffer": "npm:@nolyfill/safe-buffer@^1",
7170
"safer-buffer": "npm:@nolyfill/safer-buffer@^1",
7271
"string.prototype.matchall": "npm:@nolyfill/string.prototype.matchall@^1",
72+
"string.prototype.repeat": "npm:@nolyfill/string.prototype.repeat@^1",
7373
"typedarray": "npm:@nolyfill/typedarray@^1"
7474
}
7575
}

0 commit comments

Comments
 (0)