Skip to content

Commit 41a54c7

Browse files
committed
Merge pull request 'chore: skip binary build during goreleaser workflow' (#1347) from chore/skip-binary-build into master
Reviewed-on: https://gitea.obmondo.com/EnableIT/LinuxAid/pulls/1347
2 parents 18aa1ea + 1772c7c commit 41a54c7

File tree

3 files changed

+25
-13
lines changed

3 files changed

+25
-13
lines changed

.goreleaser-gitea.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
---
22
version: 2
33

4-
release:
5-
footer: >-
6-
Released by [GoReleaser](https://github.com/goreleaser/goreleaser).
7-
84
changelog:
95
use: gitea
106
sort: asc
@@ -24,8 +20,13 @@ changelog:
2420
- title: 🐛 Bug fixes
2521
regexp: '^.*?fix(\([[:word:]]+\))??!?:.+$'
2622
order: 1
23+
- title: 🎭 Puppet Modules
24+
regexp: '^chore:\s(pin|update|added)\spuppet-.*'
25+
order: 998
2726
- title: 🥴 Others
2827
order: 999
28+
builds:
29+
- skip: true
2930

3031
gitea_urls:
3132
api: https://gitea.obmondo.com/api/v1

.goreleaser-github.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
---
22
version: 2
33

4-
release:
5-
footer: >-
6-
Released by [GoReleaser](https://github.com/goreleaser/goreleaser).
7-
84
changelog:
95
use: github
106
sort: asc
@@ -24,5 +20,11 @@ changelog:
2420
- title: 🐛 Bug fixes
2521
regexp: '^.*?fix(\([[:word:]]+\))??!?:.+$'
2622
order: 1
23+
- title: 🎭 Puppet Modules
24+
regexp: '^chore:\s(pin|update|added)\spuppet-.*'
25+
order: 998
2726
- title: 🥴 Others
2827
order: 999
28+
29+
builds:
30+
- skip: true

bin/update_puppetfile.sh

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ OPTIONS:
4040
Requires: Upstream module name
4141
Optional: Commit hash to pin to specific version
4242
43-
--add-module <module-url> [commit-hash|]
44-
Update a specific Openvox module
45-
Requires: Upstream module name
43+
--add-module <module-url> [commit-hash]
44+
Add a specific Openvox module (defaults to latest tag)
45+
Requires: Upstream module git URL
4646
Optional: Commit hash to pin to specific version
4747
4848
--puppetfile Path to Puppetfile
@@ -51,6 +51,13 @@ OPTIONS:
5151
-h, --help Display this help message and exit
5252
5353
EXAMPLES:
54+
# Add a specific module with latest tag
55+
${SCRIPT_NAME} --add-module <git-url>
56+
57+
# Add a specific module with pinned commit or specific tag
58+
${SCRIPT_NAME} --add-module <git-url> <commit-hash>
59+
${SCRIPT_NAME} --add-module <git-url> <tag>
60+
5461
# Update a specific module with pinned commit or specific tag
5562
${SCRIPT_NAME} --update-module <module-name> <commit-hash>
5663
${SCRIPT_NAME} --update-module <module-name> <tag>
@@ -241,6 +248,8 @@ mod 'obmondo/${MODULE_NAME}',
241248
EOF
242249
echo "Added ${MODULE_NAME} at ${LATEST_TAG} to Puppetfile"
243250
fi
251+
252+
git add "$PUPPETFILE"
244253
}
245254

246255
# Function to add new module in linuxaid
@@ -263,8 +272,8 @@ Source: ${GIT_URL}/commit/${COMMIT_HASH}"
263272
Source: ${GIT_URL}/releases/tag/${LATEST_TAG}"
264273
fi
265274

275+
update_puppetfile
266276
sync_module_to_linuxaid "$MODULE_NAME" "$COMMIT_MESSAGE"
267-
update_puppetfile "Added"
268277
}
269278

270279
# Check each repository for updates
@@ -300,8 +309,8 @@ Source: ${GIT_URL}/commit/${COMMIT_HASH}"
300309
Source: ${GIT_URL}/releases/tag/${LATEST_TAG}"
301310
fi
302311

312+
update_puppetfile
303313
sync_module_to_linuxaid "$MODULE_NAME" "$COMMIT_MESSAGE"
304-
update_puppetfile "Update"
305314
}
306315

307316
function sync_module_to_linuxaid() {

0 commit comments

Comments
 (0)