Skip to content

Commit 2a8b6ff

Browse files
committed
Rename and fix changelog generation workflow
1 parent 3343324 commit 2a8b6ff

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.github/workflows/docs-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ concurrency:
5252
jobs:
5353
changelog-develop:
5454
name: Create changelog of FAF Develop
55-
uses: ./.github/workflows/docs-changelog.yaml
55+
uses: ./.github/workflows/docs-generate-changelog.yaml
5656
with:
5757
reference: deploy/fafdevelop
5858

5959
changelog-beta:
6060
name: Create changelog of FAF Beta
61-
uses: ./.github/workflows/docs-changelog.yaml
61+
uses: ./.github/workflows/docs-generate-changelog.yaml
6262
with:
6363
reference: deploy/fafbeta
6464

.github/workflows/docs-changelog.yaml renamed to .github/workflows/docs-generate-changelog.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,12 @@ on:
3131
reference:
3232
required: true
3333
type: string
34-
description: The reference (branch or tag) to use to compile the changelog snippets from
34+
description: The reference (branch or tag) to use
3535

3636
pull_request:
3737
paths:
3838
- "changelog/snippets/*.md"
39+
3940
push:
4041
branches:
4142
- deploy/fafdevelop
@@ -77,17 +78,17 @@ jobs:
7778
7879
- name: Create the changelog file
7980
working-directory: fa/changelog/snippets # script assumes it is in this directory
80-
# We need to remove `deploy/` from the branch name.
81+
# We need to remove the `/` any anything in front of it from the branch name.
8182
# Specifically the `/` is problematic in a file name.
8283
run: |
8384
REFERENCE="${{ inputs.reference || github.head_ref || github.ref_name}}"
84-
NAME="changelog-${REFERENCE#deploy/}"
85+
NAME="changelog-${REFERENCE#*/}"
8586
echo "NAME=$NAME" >> $GITHUB_ENV
8687
changelog-combine.sh ${{ env.NAME }}
8788
8889
- name: Add the changelog as an artifact
8990
uses: actions/upload-artifact@v4
9091
with:
91-
name: changelog-${{ env.NAME }}
92+
name: ${{ env.NAME }}
9293
path: |
9394
fa/changelog/snippets/${{ env.NAME }}.md

docs/development-changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ All changelogs can be found in the [changelog folder](https://github.com/FAForev
1616

1717
## Changelog snippets
1818

19-
We use snippets to reduce the burden on maintainers to write an accurate changelog and at the same time enable contributors to describe the changes of a pull request. A contributor is required to create a snippet before a pull request is merged. Remember that the target audience of the changelog are the players, so try to make the changelog easily understandable. All snippets reside in the [snippets folder](https://github.com/FAForever/fa/blob/develop/changelog/snippets/). We use a [workflow](https://github.com/FAForever/fa/blob/develop/.github/workflows/docs-changelog.yaml) to compile the snippets into a typical changelog file. This changelog file can then be tweaked, spell checked and be used as (intermediate) release notes.
19+
We use snippets to reduce the burden on maintainers to write an accurate changelog and at the same time enable contributors to describe the changes of a pull request. A contributor is required to create a snippet before a pull request is merged. Remember that the target audience of the changelog are the players, so try to make the changelog easily understandable. All snippets reside in the [snippets folder](https://github.com/FAForever/fa/blob/develop/changelog/snippets/). We use a [workflow](https://github.com/FAForever/fa/blob/develop/.github/workflows/docs-generate-changelog.yaml) to compile the snippets into a typical changelog file. This changelog file can then be tweaked, spell checked and be used as (intermediate) release notes.
2020

2121
### Format of a snippet
2222

0 commit comments

Comments
 (0)