Skip to content

Commit d6308f7

Browse files
authored
Upgrade Release Process (#2015)
* add release.yml * upgrade docgenerator to use tags * rm recent changes and update CHANGELOG
1 parent 40df8a4 commit d6308f7

File tree

5 files changed

+37
-92
lines changed

5 files changed

+37
-92
lines changed

.github/release.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
changelog:
2+
exclude:
3+
labels:
4+
- "ignore-for-release"
5+
categories:
6+
- title: Changes in MSTG Content
7+
labels:
8+
- "change-mstg"
9+
- title: Errata Corrections (typos & more)
10+
labels:
11+
- "errata"
12+
- title: New Donators
13+
labels:
14+
- "donation"
15+
- title: Other Changes
16+
labels:
17+
- "*"

.github/workflows/docgenerator.yml

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ name: Documents Build
22

33
on: [push, workflow_dispatch]
44

5-
env:
6-
VERSION: "1.2"
7-
85
jobs:
96

107
generate:
@@ -14,6 +11,13 @@ jobs:
1411
with:
1512
fetch-depth: 1
1613

14+
- name: Set VERSION to env
15+
run: echo "VERSION=$(curl -s https://api.github.com/repos/OWASP/owasp-mstg/releases/latest | jq '.tag_name' | sed 's/\"//g')" >> $GITHUB_ENV
16+
17+
- name: Set DEV VERSION if it's not a tag
18+
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
19+
run: echo "VERSION=${{env.VERSION}}-$(git rev-parse --short HEAD)" >> $GITHUB_ENV
20+
1721
- name: Generate English PDF
1822
run: ./tools/docker/pandoc_makedocs.sh Document ${{env.VERSION}}
1923

@@ -23,20 +27,6 @@ jobs:
2327
name: OWASP_MSTG-${{env.VERSION}}
2428
path: OWASP_MSTG-${{env.VERSION}}*
2529

26-
# - name: Listing of root directory
27-
# run: ls -l
28-
29-
# - name: Listing of root directory
30-
# run: ls -l tools/
31-
32-
- name: Upload RECENT Changes
33-
uses: actions/upload-artifact@v2
34-
if: startsWith(github.ref, 'refs/tags/') && (github.actor == 'cpholguera' || github.actor == 'sushi2k')
35-
with:
36-
name: RECENT_CHANGES.md
37-
path: tools/RECENT_CHANGES.md
38-
39-
4030
release:
4131
runs-on: ubuntu-latest
4232
needs: [generate]
@@ -54,14 +44,14 @@ jobs:
5444
run: pwd
5545
- name: Listing of root directory
5646
run: ls -l
57-
# - name: Cleanup - Remove all downloaded documents
58-
# run: rm -rf OWASP_MSTG-*/
47+
5948
- name: Release
6049
uses: softprops/action-gh-release@v1
6150
with:
62-
body_path: RECENT_CHANGES.md/RECENT_CHANGES.md
63-
# body_path: RECENT_CHANGES.md
64-
# body: 'MSTG test'
51+
prerelease: false
52+
draft: true
53+
generate_release_notes: true
54+
discussion_category_name: Announcements
6555
files: |
6656
OWASP_MSTG-*/OWASP_MSTG-*.pdf
6757
OWASP_MSTG-*/OWASP_MSTG-*.epub

CHANGELOG.md

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

3+
## V1.2.1 and newer
4+
5+
All our Changelogs are available online at the OWASP MSTG GitHub repository, see the [Releases page](https://github.com/OWASP/owasp-mstg/releases).
6+
37
## v1.2 - 25th July 2021
48

59
167 issues were closed since the last release. A full overview can be seen in Github Issues <https://github.com/OWASP/owasp-mstg/issues?q=is%3Aissue+is%3Aclosed+closed%3A2019-08-03..2021-07-25>.

Document/CHANGELOG.md

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

3+
## V1.2.1 and newer
4+
5+
All our Changelogs are available online at the OWASP MSTG GitHub repository, see the [Releases page](https://github.com/OWASP/owasp-mstg/releases).
6+
37
## v1.2 - 25th July 2021
48

59
167 issues were closed since the last release. A full overview can be seen in Github Issues <https://github.com/OWASP/owasp-mstg/issues?q=is%3Aissue+is%3Aclosed+closed%3A2019-08-03..2021-07-25>.

tools/RECENT_CHANGES.md

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

0 commit comments

Comments
 (0)