Skip to content

Commit 16c71dd

Browse files
authored
Merge pull request #3
develp
2 parents 270ea17 + e4581d0 commit 16c71dd

File tree

5 files changed

+72
-69
lines changed

5 files changed

+72
-69
lines changed

.release/release-template.hbs

Lines changed: 59 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,13 @@
4747
{{/each}}
4848
{{/if}}
4949

50+
{{#if children-crossing}}
51+
### 🚸 Improve user experience / usability.
52+
{{#each children-crossing}}
53+
- {{> commitTemplate}}
54+
{{/each}}
55+
{{/if}}
56+
5057
{{#if iphone}}
5158
### 📱 Work on responsive design.
5259
{{#each iphone}}
@@ -103,13 +110,48 @@
103110
{{/each}}
104111
{{/if}}
105112

113+
{{#if rotating-light}}
114+
### 🚨 Remove linter warnings.
115+
{{#each rotating-light}}
116+
- {{> commitTemplate}}
117+
{{/each}}
118+
{{/if}}
119+
120+
{{#if green-heart}}
121+
### 💚 Fix CI Build.
122+
{{#each green-heart}}
123+
- {{> commitTemplate}}
124+
{{/each}}
125+
{{/if}}
126+
127+
{{#if arrow-down}}
128+
### ⬇️ Downgrade dependencies.
129+
{{#each arrow-down}}
130+
- {{> commitTemplate}}
131+
{{/each}}
132+
{{/if}}
133+
134+
{{#if arrow-up}}
135+
### ⬆️ Upgrade dependencies.
136+
{{#each arrow-up}}
137+
- {{> commitTemplate}}
138+
{{/each}}
139+
{{/if}}
140+
106141
{{#if pushpin}}
107142
### 📌 Pin dependencies to specific versions.
108143
{{#each pushpin}}
109144
- {{> commitTemplate}}
110145
{{/each}}
111146
{{/if}}
112147

148+
{{#if construction-worker}}
149+
### 👷 Add or update CI build system.
150+
{{#each construction-worker}}
151+
- {{> commitTemplate}}
152+
{{/each}}
153+
{{/if}}
154+
113155
{{#if recycle}}
114156
### ♻️ Refactor code.
115157
{{#each recycle}}
@@ -152,13 +194,27 @@
152194
{{/each}}
153195
{{/if}}
154196

197+
{{#if loud-sound}}
198+
### 🔊 Add or update logs.
199+
{{#each loud-sound}}
200+
- {{> commitTemplate}}
201+
{{/each}}
202+
{{/if}}
203+
155204
{{#if mute}}
156205
### 🔇 Remove logs.
157206
{{#each mute}}
158207
- {{> commitTemplate}}
159208
{{/each}}
160209
{{/if}}
161210

211+
{{#if building-construction}}
212+
### 🏗 Make architectural changes.
213+
{{#each building-construction}}
214+
- {{> commitTemplate}}
215+
{{/each}}
216+
{{/if}}
217+
162218
{{#if mag}}
163219
### 🔍 Improve SEO.
164220
{{#each mag}}
@@ -173,9 +229,9 @@
173229
{{/each}}
174230
{{/if}}
175231

176-
{{#if construction}}
177-
### 🚧 Work in progress.
178-
{{#each construction}}
232+
{{#if goal-net}}
233+
### 🥅 Catch errors.
234+
{{#each goal-net}}
179235
- {{> commitTemplate}}
180236
{{/each}}
181237
{{/if}}
@@ -208,41 +264,6 @@
208264
{{/each}}
209265
{{/if}}
210266

211-
{{#if rotating-light}}
212-
### 🚨 Remove linter warnings.
213-
{{#each rotating-light}}
214-
- {{> commitTemplate}}
215-
{{/each}}
216-
{{/if}}
217-
218-
{{#if green-heart}}
219-
### 💚 Fix CI Build.
220-
{{#each green-heart}}
221-
- {{> commitTemplate}}
222-
{{/each}}
223-
{{/if}}
224-
225-
{{#if arrow-down}}
226-
### ⬇️ Downgrade dependencies.
227-
{{#each arrow-down}}
228-
- {{> commitTemplate}}
229-
{{/each}}
230-
{{/if}}
231-
232-
{{#if arrow-up}}
233-
### ⬆️ Upgrade dependencies.
234-
{{#each arrow-up}}
235-
- {{> commitTemplate}}
236-
{{/each}}
237-
{{/if}}
238-
239-
{{#if construction-worker}}
240-
### 👷 Add or update CI build system.
241-
{{#each construction-worker}}
242-
- {{> commitTemplate}}
243-
{{/each}}
244-
{{/if}}
245-
246267
{{#if chart-with-upwards-trend}}
247268
### 📈 Add or update analytics or track code.
248269
{{#each chart-with-upwards-trend}}
@@ -334,34 +355,13 @@
334355
{{/each}}
335356
{{/if}}
336357

337-
{{#if loud-sound}}
338-
### 🔊 Add or update logs.
339-
{{#each loud-sound}}
340-
- {{> commitTemplate}}
341-
{{/each}}
342-
{{/if}}
343-
344358
{{#if busts-in-silhouette}}
345359
### 👥 Add or update contributor(s).
346360
{{#each busts-in-silhouette}}
347361
- {{> commitTemplate}}
348362
{{/each}}
349363
{{/if}}
350364

351-
{{#if children-crossing}}
352-
### 🚸 Improve user experience / usability.
353-
{{#each children-crossing}}
354-
- {{> commitTemplate}}
355-
{{/each}}
356-
{{/if}}
357-
358-
{{#if building-construction}}
359-
### 🏗 Make architectural changes.
360-
{{#each building-construction}}
361-
- {{> commitTemplate}}
362-
{{/each}}
363-
{{/if}}
364-
365365
{{#if clown-face}}
366366
### 🤡 Mock things.
367367
{{#each clown-face}}
@@ -404,13 +404,6 @@
404404
{{/each}}
405405
{{/if}}
406406

407-
{{#if goal-net}}
408-
### 🥅 Catch errors.
409-
{{#each goal-net}}
410-
- {{> commitTemplate}}
411-
{{/each}}
412-
{{/if}}
413-
414407
{{#if animation}}
415408
### 💫 Add or update animations and transitions.
416409
{{#each animation}}

Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ gen:
6161
@echo
6262
@echo
6363
@echo "$(PURPLE)# GEN: 3. Generated!$(RESET)"
64-
@echo "Generated gitmojis.json and gitmojis.yml whith semver field"
64+
@echo "Generated gitmojis.json and gitmojis.yml with semver field"
6565
@echo "See ./build/dist"
6666

6767
@echo
@@ -81,6 +81,8 @@ list:
8181
@cat $(GITMOJI_FILE) | jq -c '.gitmojis[] | select(.semver=="patch") | $(FORMAT)'
8282
@echo "\n# None"
8383
@cat $(GITMOJI_FILE) | jq -c '.gitmojis[] | select(.semver=="none") | $(FORMAT)'
84+
@echo "\n# Ignore (Not to be added to the changelog when use semantic-release)"
85+
@cat $(GITMOJI_FILE) | jq -c '.gitmojis[] | select(.semver=="ignore") | $(FORMAT)'
8486

8587
scaffold: gen
8688
@echo
@@ -92,6 +94,10 @@ scaffold: gen
9294
mv $(OUT_DIR)/.release/release.yml $(OUT_DIR)/.github/workflows
9395
cp ./build/dist/release-template.hbs $(OUT_DIR)/.release
9496
cp ./build/src/semver.json $(OUT_DIR)/.release
97+
@echo
98+
@echo "$(LIGHTPURPLE)🎉 Add semantic-release setting files$(RESET)"
99+
@echo $(OUT_DIR)/.release
100+
@echo $(OUT_DIR)/.github/workflows/release.yml
95101

96102
# Short commands
97103
l: list

gen-release-template.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ function run() {
2222
}
2323

2424
for (const key of Object.keys(semverObj)) {
25+
if (key === 'ignore'){
26+
continue
27+
}
2528
for (const gitmojiObj of semverObj[key]) {
2629
res += buildH3Template(gitmojiObj)
2730
}

gitmoji-semver.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const semverObj = JSON.parse(fs.readFileSync('./build/src/semver.json', 'utf8'))
55
function run() {
66
const res = {gitmojis: []};
77
for (const v of gitmojisObj.gitmojis) {
8-
v.semver = semver(v.name)
8+
v.semver = semver(v.name.replace('-','_'))
99
res.gitmojis.push(v)
1010
}
1111

semver.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,6 @@ semver:
7070
- seedling # Add or update seed files.
7171
- wastebasket # Deprecate code that needs to be cleaned up.
7272

73-
ignore: # hide in changelog
73+
# not add in release-template.hbs
74+
ignore:
7475
- construction # Work in progress.

0 commit comments

Comments
 (0)