Skip to content

Commit 1a5eaa7

Browse files
committed
feat!: changing helpers post 17
1 parent 47bd15a commit 1a5eaa7

File tree

2 files changed

+57
-58
lines changed

2 files changed

+57
-58
lines changed
+57-56
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
name: Release Helpers
22

3-
43
on:
54
push:
65
branches:
76
- main
87
paths:
9-
- 'helpers/**'
8+
- "helpers/**"
109
workflow_dispatch:
1110

1211
jobs:
@@ -15,67 +14,69 @@ jobs:
1514
steps:
1615
- name: Checkout
1716
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
17+
with:
18+
fetch-depth: 0
1819

19-
# - name: Release
20-
# uses: ./.github/actions/release
21-
# with:
22-
# module: "helpers"
20+
- name: Release
21+
uses: ./.github/actions/release
22+
with:
23+
module: "helpers"
2324

24-
- name: bump module version
25-
id: module-tag
26-
run: |
27-
git fetch --tags
28-
cd internal/release
29-
echo "new-version=$(go run main.go helpers)" >> $GITHUB_OUTPUT
30-
shell: bash
25+
# - name: bump module version
26+
# id: module-tag
27+
# run: |
28+
# git fetch --tags
29+
# cd internal/release
30+
# echo "new-version=$(go run main.go helpers)" >> $GITHUB_OUTPUT
31+
# shell: bash
3132

32-
- name: install git cliffs
33-
env:
34-
# renovate: datasource=github-tags depName=orhun/git-cliff versioning=semver
35-
VERSION: 2.1.2
36-
run: |
37-
curl --location --output /tmp/git-cliffs.tar.gz https://github.com/orhun/git-cliff/releases/download/v${VERSION}/git-cliff-${VERSION}-x86_64-unknown-linux-gnu.tar.gz
38-
tar -xvzf /tmp/git-cliffs.tar.gz -C /tmp
39-
mv /tmp/git-cliff-${VERSION}/git-cliff /usr/local/bin/
40-
shell: bash
33+
# - name: install git cliffs
34+
# env:
35+
# # renovate: datasource=github-tags depName=orhun/git-cliff versioning=semver
36+
# VERSION: 2.1.2
37+
# run: |
38+
# curl --location --output /tmp/git-cliffs.tar.gz https://github.com/orhun/git-cliff/releases/download/v${VERSION}/git-cliff-${VERSION}-x86_64-unknown-linux-gnu.tar.gz
39+
# tar -xvzf /tmp/git-cliffs.tar.gz -C /tmp
40+
# mv /tmp/git-cliff-${VERSION}/git-cliff /usr/local/bin/
41+
# shell: bash
4142

42-
- name: specify helpers
43-
run: git cliff -u --tag ${{ steps.module-tag.outputs.new-version }} --include-path "helpers/*"
43+
# - name: specify helpers
44+
# run: git cliff -u --tag ${{ steps.module-tag.outputs.new-version }} --include-path "helpers/*"
4445

45-
- name: generate release notes without specifying helpers
46-
run: |
47-
git cliff -u --tag ${{ steps.module-tag.outputs.new-version }} | tee notes.md
48-
shell: bash
46+
# - name: generate release notes without specifying helpers
47+
# run: |
48+
# git cliff -u --tag ${{ steps.module-tag.outputs.new-version }} | tee notes.md
49+
# shell: bash
4950

50-
- name: Release
51-
env:
52-
GH_TOKEN: ${{ github.token }}
53-
run: |
54-
cat notes.md
55-
gh release create ${{ steps.module-tag.outputs.new-version }} --notes-file notes.md
56-
git fetch --all
57-
shell: bash
51+
# - name: Release
52+
# env:
53+
# GH_TOKEN: ${{ github.token }}
54+
# run: |
55+
# cat notes.md
56+
# gh release create ${{ steps.module-tag.outputs.new-version }} --notes-file notes.md
57+
# git fetch --all
58+
# shell: bash
5859

59-
- name: Generate a changelog
60-
uses: orhun/git-cliff-action@v3
61-
id: git-cliff-1
62-
with:
63-
config: cliff.toml
64-
args: -v --latest --include-path "helpers/*"
65-
env:
66-
OUTPUT: CHANGES1.md
60+
# - name: Generate a changelog
61+
# uses: orhun/git-cliff-action@v3
62+
# id: git-cliff-1
63+
# with:
64+
# config: cliff.toml
65+
# args: -v --latest --include-path "helpers/*"
66+
# env:
67+
# OUTPUT: CHANGES1.md
6768

68-
- name: show changelog
69-
run: echo " this is the first one ${{ steps.git-cliff-1.outputs.content }}"
69+
# - name: show changelog
70+
# run: echo " this is the first one ${{ steps.git-cliff-1.outputs.content }}"
7071

71-
- name: Generate a changelog
72-
uses: orhun/git-cliff-action@v3
73-
id: git-cliff-2
74-
with:
75-
config: cliff.toml
76-
args: -v --latest
77-
env:
78-
OUTPUT: CHANGES.md
72+
# - name: Generate a changelog
73+
# uses: orhun/git-cliff-action@v3
74+
# id: git-cliff-2
75+
# with:
76+
# config: cliff.toml
77+
# args: -v --latest
78+
# env:
79+
# OUTPUT: CHANGES.md
7980

80-
- name: show changelog
81-
run: echo " this is the first second one ${{ steps.git-cliff-2.outputs.content }}"
81+
# - name: show changelog
82+
# run: echo " this is the first second one ${{ steps.git-cliff-2.outputs.content }}"

helpers/misc.go

-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ func TransformAndMergeMap[T any](m1, m2 map[string]T, transform func(string) str
7474

7575

7676

77-
78-
7977
// MergeMapRecursive recursively (nestedly) merges map m2 with m1 overwriting common values with m2's values.
8078
func MergeMapRecursive(m1, m2 map[string]interface{}) (r map[string]interface{}) {
8179
r = map[string]interface{}{}

0 commit comments

Comments
 (0)