Skip to content

Commit d7cf234

Browse files
hypery2khypery2k
committed
chore: Adding changelog generation
1 parent 6c2bce7 commit d7cf234

File tree

3 files changed

+86
-3
lines changed

3 files changed

+86
-3
lines changed

‎.github/workflows/release.yml‎

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ jobs:
1717
uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 0
20+
- name: Setup NodeJS
21+
uses: actions/setup-node@v4
2022
- name: Setup Java
2123
uses: actions/setup-java@v4 # Does also set up Maven and GPG
2224
with:
@@ -28,12 +30,45 @@ jobs:
2830
server-username: OSSRH_USERNAME
2931
server-password: OSSRH_PASSWORD
3032
cache: 'maven'
31-
- name: Build & Deploy
33+
- name: Prepare
3234
run: |
3335
git config --global user.name github-actions[bot]
3436
git config --global user.email 41898282+github-actions[bot]@users.noreply.github.com
35-
git config --global pull.rebase true
37+
git config --global pull.rebase true#
38+
npm install -g conventional-changelog-cli
39+
- name: Build release
40+
run: |
3641
mvn -B gitflow:release ${{ inputs.release_args }}
42+
git fetch --tags
43+
# Get latest tag name
44+
latestTag=$(git describe --tags `git rev-list --tags --max-count=1`)
45+
# Checkout latest tag
46+
echo checking out ${latesttag}
47+
git checkout $latestTag
48+
# Build changelog
49+
conventional-changelog -p angular -i CHANGELOG.md -s
50+
git stash
51+
# Push changes
52+
git checkout develop
53+
git stash apply
54+
git commit -m "chore: Updating changelog"
55+
git checkout -b release/$latestTag
56+
git push origin $latestTag
57+
git push origin release/$latestTag
3758
env:
3859
OSSRH_USERNAME: ${{ secrets.OSS_SONATYPE_USER }}
3960
OSSRH_PASSWORD: ${{ secrets.OSS_SONATYPE_PASS }}
61+
62+
- name: Build Changelog
63+
id: github_release
64+
uses: mikepenz/release-changelog-builder-action@v4
65+
env:
66+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
67+
68+
- name: Create Release
69+
uses: mikepenz/action-gh-release@v1
70+
with:
71+
body: ${{steps.github_release.outputs.changelog}}
72+
73+
- name: Create Pull Request
74+
uses: peter-evans/create-pull-request@v5

‎CHANGELOG.md‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# [0.3.3](https://github.com/ContinuousSecurityTooling/zap-java/compare/v0.3.2...v0.3.3) (2023-12-13)
2+
3+
4+
### Bug Fixes
5+
6+
* **build:** Switch to Maven Wrapper ([f9f733a](https://github.com/ContinuousSecurityTooling/zap-java/commit/f9f733aba38aaa67f09aa7f7cbb9bc2bb338c1da))
7+
* **deploy:** Try to fix `gpg: signing failed: Inappropriate ioctl for device` ([16896ff](https://github.com/ContinuousSecurityTooling/zap-java/commit/16896ff5ac2f0d4668a401540c9c763a8f5c0d60))
8+
* **deps:** update dependency ch.qos.logback:logback-classic to v1.2.13 [security] ([5322735](https://github.com/ContinuousSecurityTooling/zap-java/commit/5322735d55e9e6304a66d661eecbecce09679793))
9+
* **deps:** update dependency commons-io:commons-io to v2.11.0 ([7783ab3](https://github.com/ContinuousSecurityTooling/zap-java/commit/7783ab3cc63c4f299c29fda9a4b0e673f76a7713))
10+
* **deps:** update dependency commons-io:commons-io to v2.12.0 ([290e1fc](https://github.com/ContinuousSecurityTooling/zap-java/commit/290e1fc8d00874281e4d9dba698866270f9a5a27))
11+
* **deps:** update dependency commons-io:commons-io to v2.13.0 ([46ef1ae](https://github.com/ContinuousSecurityTooling/zap-java/commit/46ef1aeec3bbfd1290fbdb16d07eed9bed62510f))
12+
* **deps:** update dependency commons-io:commons-io to v2.15.1 ([9c16754](https://github.com/ContinuousSecurityTooling/zap-java/commit/9c16754a1c4aef4cfcdc4f12b3008cf5782a1a2d))
13+
* **deps:** update dependency commons-io:commons-io to v2.7 [security] ([6fcfb1f](https://github.com/ContinuousSecurityTooling/zap-java/commit/6fcfb1f8d0c667d55ab1f787c05d1af17b99371d))
14+
* **deps:** update dependency org.apache.commons:commons-lang3 to v3.12.0 ([a76b787](https://github.com/ContinuousSecurityTooling/zap-java/commit/a76b7875aa2be13e50d41ccfc8cfb5b8923cc861))
15+
* **deps:** update dependency org.apache.commons:commons-lang3 to v3.13.0 ([c134da5](https://github.com/ContinuousSecurityTooling/zap-java/commit/c134da5fa165b8bbd0f9d3260bf3627ec7c6d852))
16+
* **deps:** update dependency org.apache.commons:commons-lang3 to v3.14.0 ([0cb3478](https://github.com/ContinuousSecurityTooling/zap-java/commit/0cb3478e4c63b0f1ea5e224e7e53efea366a9ace))
17+
* **deps:** update dependency org.apache.maven:maven-plugin-api to v3.9.1 ([4e1f36a](https://github.com/ContinuousSecurityTooling/zap-java/commit/4e1f36a3df2538fbfcad16d38d835db3c4421812))
18+
* **deps:** update dependency org.apache.maven:maven-plugin-api to v3.9.2 ([cd9510b](https://github.com/ContinuousSecurityTooling/zap-java/commit/cd9510bc0e2c90a37247b715cca9644df855c521))
19+
* **deps:** update dependency org.apache.maven:maven-plugin-api to v3.9.3 ([d237b8f](https://github.com/ContinuousSecurityTooling/zap-java/commit/d237b8faae3a85485c371d81e0c77f1063599b57))
20+
* **deps:** update dependency org.apache.maven:maven-plugin-api to v3.9.4 ([a085ef6](https://github.com/ContinuousSecurityTooling/zap-java/commit/a085ef69138d3dbf475e16c0b4f5c45cd425e047))
21+
* **deps:** update dependency org.apache.maven:maven-plugin-api to v3.9.5 ([464b14a](https://github.com/ContinuousSecurityTooling/zap-java/commit/464b14a24862b9cc7b07a883f33d8749874da186))
22+
* **deps:** update dependency org.apache.maven:maven-plugin-api to v3.9.6 ([dce0487](https://github.com/ContinuousSecurityTooling/zap-java/commit/dce0487d7c98bf47be81828cbd9fa1c5bf0ca0ed))
23+
* **deps:** update dependency org.apache.maven.plugin-tools:maven-plugin-annotations to v3.10.1 ([0e64e8b](https://github.com/ContinuousSecurityTooling/zap-java/commit/0e64e8bd878a42ef659f40949b88653e2d38c7db))
24+
* **deps:** update dependency org.apache.maven.plugin-tools:maven-plugin-annotations to v3.10.2 ([ab012b0](https://github.com/ContinuousSecurityTooling/zap-java/commit/ab012b0b5550b07b64cba096f3ca632fb2b85f2e))
25+
* **deps:** update dependency org.apache.maven.plugin-tools:maven-plugin-annotations to v3.8.1 ([5f916a3](https://github.com/ContinuousSecurityTooling/zap-java/commit/5f916a37660967ef9a0bc05f19a0fd00f08ec830))
26+
* **deps:** update dependency org.apache.maven.plugin-tools:maven-plugin-annotations to v3.8.2 ([3e9bdd6](https://github.com/ContinuousSecurityTooling/zap-java/commit/3e9bdd6cedb0c75d395dd3da43f830bafd146831))
27+
* **deps:** update dependency org.apache.maven.plugin-tools:maven-plugin-annotations to v3.9.0 ([26ff1e2](https://github.com/ContinuousSecurityTooling/zap-java/commit/26ff1e2cd911da3677d8c40414f64ad1a7099345))
28+
* **deps:** update dependency org.seleniumhq.selenium:selenium-java to v2.53.1 ([a27bb32](https://github.com/ContinuousSecurityTooling/zap-java/commit/a27bb329d44b9f8b5de529ddd1202a060e2edfd6))
29+
* **deps:** update dependency org.slf4j:slf4j-api to v1.7.36 ([0525a6f](https://github.com/ContinuousSecurityTooling/zap-java/commit/0525a6f2739c9b9adf3b8f0ba290bcee238b094a))
30+
* **deps:** update dependency org.testng:testng to v7 [security] ([e51ede8](https://github.com/ContinuousSecurityTooling/zap-java/commit/e51ede8675d7dac3b4a836e5a8defc09d1b59a03))
31+
* **deps:** update dependency org.testng:testng to v7.7.1 ([027777d](https://github.com/ContinuousSecurityTooling/zap-java/commit/027777d741c01b33272ea8c529817710916684bd))
32+
* **deps:** update dependency org.testng:testng to v7.8.0 ([5f6272b](https://github.com/ContinuousSecurityTooling/zap-java/commit/5f6272b50a6128faf955156d8041e29c8bd4c3ed))
33+
* **deps:** update dependency org.zaproxy:zap-clientapi to v1.11.0 ([744b20b](https://github.com/ContinuousSecurityTooling/zap-java/commit/744b20b728c464e742f1dfd4a3bd574e4f876fb9))
34+
* **deps:** update dependency org.zaproxy:zap-clientapi to v1.12.0 ([8be2dea](https://github.com/ContinuousSecurityTooling/zap-java/commit/8be2dea6db7dbff6b9a5dccdc936ef9d15225eba))
35+
* **deps:** update dependency org.zaproxy:zap-clientapi to v1.13.0 ([05ad111](https://github.com/ContinuousSecurityTooling/zap-java/commit/05ad11122e860cd5ab919990edcf140f01fe7549))
36+
* **GPG:** Resolve GPG 2.1 sign error ([9210550](https://github.com/ContinuousSecurityTooling/zap-java/commit/921055098b8637341697fafb348c9aaa2c867584))
37+
* **modules:** Use correct modules ([83c374e](https://github.com/ContinuousSecurityTooling/zap-java/commit/83c374e6e5c7aead99ef9c8eb99911d6595272b3))
38+
* **Release:** Adding source and javadoc ([0ed48e6](https://github.com/ContinuousSecurityTooling/zap-java/commit/0ed48e6509fd4ad6ee73cf3144c8a4d2445c40d0))
39+
* **release:** Corrected release build ([0da300d](https://github.com/ContinuousSecurityTooling/zap-java/commit/0da300d275ee80e1cc58be0fcaa682922ce9c25c))
40+
* upgrade commons-io:commons-io from 2.13.0 to 2.14.0 ([b716c25](https://github.com/ContinuousSecurityTooling/zap-java/commit/b716c2537be59a2c4eff5ba3f9b84b4431cb4a89))
41+
* upgrade commons-io:commons-io from 2.14.0 to 2.15.0 ([4666a43](https://github.com/ContinuousSecurityTooling/zap-java/commit/4666a43784840ab9dad3c2f212d4e9b520ee7a42))
42+
43+
44+
### Features
45+
46+
* **Java:** Use Java 11 ([e2f6642](https://github.com/ContinuousSecurityTooling/zap-java/commit/e2f664258916119169d0fe620e6aa3618073f2db))
47+
* **Renovate:** Auto-merge ([bf1c0b8](https://github.com/ContinuousSecurityTooling/zap-java/commit/bf1c0b822c478b5c52d3c8fb081438f9a4a55d6c))
48+
* **security:** Adding snyk plugin ([5e39653](https://github.com/ContinuousSecurityTooling/zap-java/commit/5e39653059a973db10a73a37f37379b422ec28da))

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@
326326
<origin>origin</origin>
327327
</gitFlowConfig>
328328
<keepBranch>false</keepBranch>
329-
<pushReleases>true</pushReleases>
329+
<pushReleases>false</pushReleases>
330330
<skipReleaseMergeProdBranch>true</skipReleaseMergeProdBranch>
331331
<releaseMergeFFOnly>true</releaseMergeFFOnly>
332332
<releaseMergeNoFF>false</releaseMergeNoFF>

0 commit comments

Comments
 (0)