From 4246bbfddae12aa5af477d1cbed4e577c142067b Mon Sep 17 00:00:00 2001 From: Ismoh Date: Sat, 24 Sep 2022 17:50:35 +0200 Subject: [PATCH 01/15] #72 Added changelog generator in a separated yaml file and in version.yml. --- .github/workflows/changelog-generator.yml | 20 +++++++++++++++++++ .github/workflows/version.yml | 24 +++++++++++++++++------ 2 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/changelog-generator.yml diff --git a/.github/workflows/changelog-generator.yml b/.github/workflows/changelog-generator.yml new file mode 100644 index 000000000..a87db7860 --- /dev/null +++ b/.github/workflows/changelog-generator.yml @@ -0,0 +1,20 @@ +name: Changelog +on: + tag: + types: + - created + release: + types: + - created +jobs: + changelog: + runs-on: ubuntu-latest + steps: + - name: "✏ Generate release or tag changelog" + uses: heinrichreimer/github-changelog-generator-action@v2.3 + with: + token: ${{ secrets.GITHUB_TOKEN }} + dateFormat: "%d.%m.%Y" + output: "CHANGELOG.md" + issueLineLabels: "ALL" + breakingLabels: "backwards-incompatible,breaking,rework,refactor" \ No newline at end of file diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index 49402b8de..1fb17caa5 100644 --- a/.github/workflows/version.yml +++ b/.github/workflows/version.yml @@ -75,21 +75,21 @@ jobs: next-version-increment-patch: ${{ contains(env.LABEL_NAMES, 'bug') }} next-version-cut-build-metadata: false next-version-put-build-metadata: true - + - name: Extend version with custom build numbers run: | echo "NEXT_VERSION=v$NEXT_VERSION+$(git log --oneline | wc -l)" >> $GITHUB_ENV - + - name: Add comment to pull request run: | body="{\"body\":\"When this pull request was merged\\\:\r\n- Version will be automatically increase to **$NEXT_VERSION** in **${{ github.base_ref }}**\r\n- Tag **$NEXT_VERSION** will be created to the specific commit.\"}" - + curlResponse=`curl --write-out '%{http_code}' --output /dev/null --request POST \ --header 'Accept: application/vnd.github+json' \ --header 'Authorization: token ${{ github.token }}' \ --url 'https://api.github.com/repos/${{github.repository}}/issues/${{github.event.number}}/comments' \ --data-raw "$body"` - + if [[ $curlResponse == *"201"* ]] then echo "SUCCESS" @@ -97,7 +97,7 @@ jobs: echo "FAILURE" exit 1 fi - + - name: Commit version changes and tag it env: MERGED: ${{ github.event.pull_request.merged }} @@ -117,4 +117,16 @@ jobs: else echo "Pull request is not merged yet, skipping..." fi - \ No newline at end of file + + update-change-log: + needs: increase-version-by-labels + runs-on: ubuntu-latest + steps: + - name: "✏ Generate release or tag changelog" + uses: heinrichreimer/github-changelog-generator-action@v2.3 + with: + token: ${{ secrets.GITHUB_TOKEN }} + dateFormat: "%d.%m.%Y" + output: "CHANGELOG.md" + issueLineLabels: "ALL" + breakingLabels: "backwards-incompatible,breaking,rework,refactor" \ No newline at end of file From 85e9234ba787c2b299ae7f6d73c043d59375b676 Mon Sep 17 00:00:00 2001 From: Ismoh Date: Sat, 24 Sep 2022 17:51:01 +0200 Subject: [PATCH 02/15] #72 Removed changelog generator in version.yml. --- .github/workflows/version.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index 1fb17caa5..5af95b553 100644 --- a/.github/workflows/version.yml +++ b/.github/workflows/version.yml @@ -116,17 +116,4 @@ jobs: git push origin ${{ github.base_ref }} --tags else echo "Pull request is not merged yet, skipping..." - fi - - update-change-log: - needs: increase-version-by-labels - runs-on: ubuntu-latest - steps: - - name: "✏ Generate release or tag changelog" - uses: heinrichreimer/github-changelog-generator-action@v2.3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - dateFormat: "%d.%m.%Y" - output: "CHANGELOG.md" - issueLineLabels: "ALL" - breakingLabels: "backwards-incompatible,breaking,rework,refactor" \ No newline at end of file + fi \ No newline at end of file From c384911ad8e5e6c32d479b2aee0d200c25a9ffa6 Mon Sep 17 00:00:00 2001 From: Ismoh Date: Sat, 24 Sep 2022 17:52:37 +0200 Subject: [PATCH 03/15] #72 Fixed non-existing tag key in changelog-generator.yml --- .github/workflows/changelog-generator.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/changelog-generator.yml b/.github/workflows/changelog-generator.yml index a87db7860..1478f0979 100644 --- a/.github/workflows/changelog-generator.yml +++ b/.github/workflows/changelog-generator.yml @@ -1,8 +1,5 @@ name: Changelog on: - tag: - types: - - created release: types: - created From 8a4efba54c3485788a32d063359f6c7de23ae209 Mon Sep 17 00:00:00 2001 From: Ismoh Date: Sat, 24 Sep 2022 22:49:09 +0200 Subject: [PATCH 04/15] #72 Added changelog generator to version.yml --- .github/workflows/version.yml | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index 5af95b553..83cc0c00e 100644 --- a/.github/workflows/version.yml +++ b/.github/workflows/version.yml @@ -97,8 +97,34 @@ jobs: echo "FAILURE" exit 1 fi - - - name: Commit version changes and tag it + + generate-or-update-changelog: + needs: increase-version-by-labels + runs-on: ubuntu-latest + steps: + - name: "Generate CHANGELOG.md" + uses: heinrichreimer/github-changelog-generator-action@v2.3 + with: + token: ${{ secrets.GITHUB_TOKEN }} + dateFormat: "%d.%m.%Y" + output: "CHANGELOG.md" + issueLineLabels: "ALL" + breakingLabels: "backwards-incompatible,breaking,rework,refactor" + - name: Commit and push CHANGELOG.md + env: + CHANGELOG: ${{ needs.generate-or-update-changelog.outputs.changelog }} + run: | + git fetch + git checkout ${{ github.base_ref }} + git pull origin ${{ github.base_ref }} + echo "$CHANGELOG" > CHANGELOG.md + git config --local user.email "action@github.com" + git config --local user.name "github-actions" + git add CHANGELOG.md + git commit -m "Updated CHANGELOG.md in https://github.com/${{github.repository}}/pull/${{github.event.number}}" + git push origin ${{ github.base_ref }} + + - name: Commit and push version changes and tag it env: MERGED: ${{ github.event.pull_request.merged }} run: | @@ -108,7 +134,7 @@ jobs: git checkout ${{ github.base_ref }} git pull origin ${{ github.base_ref }} echo "$NEXT_VERSION" > $VERSION_FILE_NAME - git config --local user.email "action@github.com"VG + git config --local user.email "action@github.com" git config --local user.name "github-actions" git add $VERSION_FILE_NAME git commit -m "Updated version to $NEXT_VERSION in https://github.com/${{github.repository}}/pull/${{github.event.number}}" From 46545c2278a25a36e56bd991e08c6cb615ed116e Mon Sep 17 00:00:00 2001 From: Ismoh Date: Sat, 24 Sep 2022 22:53:41 +0200 Subject: [PATCH 05/15] #72 Fixed not working changelog generator workflow action. --- .github/workflows/version.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index 83cc0c00e..4f2cbb123 100644 --- a/.github/workflows/version.yml +++ b/.github/workflows/version.yml @@ -100,8 +100,13 @@ jobs: generate-or-update-changelog: needs: increase-version-by-labels + name: Generate or update CHANGELOG.md runs-on: ubuntu-latest steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: "Generate CHANGELOG.md" uses: heinrichreimer/github-changelog-generator-action@v2.3 with: @@ -110,6 +115,7 @@ jobs: output: "CHANGELOG.md" issueLineLabels: "ALL" breakingLabels: "backwards-incompatible,breaking,rework,refactor" + - name: Commit and push CHANGELOG.md env: CHANGELOG: ${{ needs.generate-or-update-changelog.outputs.changelog }} From 39b7e650fd1e10a9460260330cfa3ce467cc1260 Mon Sep 17 00:00:00 2001 From: Ismoh Date: Sat, 24 Sep 2022 23:00:40 +0200 Subject: [PATCH 06/15] #72 Trying to get the directories working?! --- .github/workflows/version.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index 4f2cbb123..77bd29f94 100644 --- a/.github/workflows/version.yml +++ b/.github/workflows/version.yml @@ -120,6 +120,10 @@ jobs: env: CHANGELOG: ${{ needs.generate-or-update-changelog.outputs.changelog }} run: | + ls -R + ls -R /github/workspace + ls -R ${{ github.workspace }} + mv ${{ github.workspace }}/CHANGELOG.md ${{ github.workspace }}/mods/noita-mp/CHANGELOG.md git fetch git checkout ${{ github.base_ref }} git pull origin ${{ github.base_ref }} From 0aa2afb4283c6f3478898b24366639d5da917d41 Mon Sep 17 00:00:00 2001 From: Ismoh Date: Sat, 24 Sep 2022 23:05:40 +0200 Subject: [PATCH 07/15] #72 Still trying to find out, where CHANGELOG.md is created. --- .github/workflows/version.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index 77bd29f94..b5438d85c 100644 --- a/.github/workflows/version.yml +++ b/.github/workflows/version.yml @@ -120,10 +120,15 @@ jobs: env: CHANGELOG: ${{ needs.generate-or-update-changelog.outputs.changelog }} run: | + echo "" + cat CHANGELOG.md + echo "" + echo $CHANGELOG + echo "" ls -R - ls -R /github/workspace ls -R ${{ github.workspace }} - mv ${{ github.workspace }}/CHANGELOG.md ${{ github.workspace }}/mods/noita-mp/CHANGELOG.md +# mv ${{ github.workspace }}/CHANGELOG.md ${{ github.workspace }}/mods/noita-mp/CHANGELOG.md + git fetch git checkout ${{ github.base_ref }} git pull origin ${{ github.base_ref }} From 4a6f2881747195163ca0980a3399c399a94dddf8 Mon Sep 17 00:00:00 2001 From: Ismoh Date: Sat, 24 Sep 2022 23:06:51 +0200 Subject: [PATCH 08/15] #72 Typo in yaml. --- .github/workflows/version.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index b5438d85c..a39dafdad 100644 --- a/.github/workflows/version.yml +++ b/.github/workflows/version.yml @@ -127,7 +127,6 @@ jobs: echo "" ls -R ls -R ${{ github.workspace }} -# mv ${{ github.workspace }}/CHANGELOG.md ${{ github.workspace }}/mods/noita-mp/CHANGELOG.md git fetch git checkout ${{ github.base_ref }} From 83c6eefbd6189b4e4042416e7a0bea542477e420 Mon Sep 17 00:00:00 2001 From: Ismoh Date: Sat, 24 Sep 2022 23:14:52 +0200 Subject: [PATCH 09/15] #72 Changed branch from github.base_ref to github.head_ref, because CHANGELOG.md has to be changed in the PR-branch itself. --- .github/workflows/version.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index a39dafdad..4161f4d37 100644 --- a/.github/workflows/version.yml +++ b/.github/workflows/version.yml @@ -129,14 +129,13 @@ jobs: ls -R ${{ github.workspace }} git fetch - git checkout ${{ github.base_ref }} - git pull origin ${{ github.base_ref }} - echo "$CHANGELOG" > CHANGELOG.md + git checkout ${{ github.head_ref }} + git pull origin ${{ github.head_ref }} git config --local user.email "action@github.com" git config --local user.name "github-actions" git add CHANGELOG.md git commit -m "Updated CHANGELOG.md in https://github.com/${{github.repository}}/pull/${{github.event.number}}" - git push origin ${{ github.base_ref }} + git push origin ${{ github.head_ref }} - name: Commit and push version changes and tag it env: From 2966c80297d6663e3fec67fbcf1fb836c42e94ff Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 24 Sep 2022 21:16:21 +0000 Subject: [PATCH 10/15] Updated CHANGELOG.md in https://github.com/Ismoh/NoitaMP/pull/73 --- CHANGELOG.md | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..8caef7107 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,76 @@ +# Changelog + +## [Unreleased](https://github.com/Ismoh/NoitaMP/tree/HEAD) + +[Full Changelog](https://github.com/Ismoh/NoitaMP/compare/v2.4.0-alpha+1045...HEAD) + +**Implemented enhancements:** + +- 41 adding name tags [\#46](https://github.com/Ismoh/NoitaMP/pull/46) [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] ([DevonX](https://github.com/DevonX)) +- Function to show players names [\#40](https://github.com/Ismoh/NoitaMP/pull/40) [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] ([DevonX](https://github.com/DevonX)) +- Entities [\#19](https://github.com/Ismoh/NoitaMP/pull/19) [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] ([Ismoh](https://github.com/Ismoh)) +- Fixed networking problems and add lua testing [\#10](https://github.com/Ismoh/NoitaMP/pull/10) [[bug](https://github.com/Ismoh/NoitaMP/labels/bug)] [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] ([Ismoh](https://github.com/Ismoh)) +- Holy moly! sock.lua + lua-enet + enet is working with steam app [\#2](https://github.com/Ismoh/NoitaMP/pull/2) [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] ([Ismoh](https://github.com/Ismoh)) + +**Merged pull requests:** + +- Develop [\#47](https://github.com/Ismoh/NoitaMP/pull/47) ([Ismoh](https://github.com/Ismoh)) +- Master into develop [\#45](https://github.com/Ismoh/NoitaMP/pull/45) ([Ismoh](https://github.com/Ismoh)) +- Develop into master [\#44](https://github.com/Ismoh/NoitaMP/pull/44) ([Ismoh](https://github.com/Ismoh)) +- Develop [\#35](https://github.com/Ismoh/NoitaMP/pull/35) ([Ismoh](https://github.com/Ismoh)) +- Removed lfs file [\#34](https://github.com/Ismoh/NoitaMP/pull/34) ([Ismoh](https://github.com/Ismoh)) +- Merge pull request \#32 from Ismoh/master [\#33](https://github.com/Ismoh/NoitaMP/pull/33) ([Ismoh](https://github.com/Ismoh)) +- master into dev [\#32](https://github.com/Ismoh/NoitaMP/pull/32) ([Ismoh](https://github.com/Ismoh)) +- Develop [\#31](https://github.com/Ismoh/NoitaMP/pull/31) ([Ismoh](https://github.com/Ismoh)) +- Merge pull request \#25 from Ismoh/develop [\#30](https://github.com/Ismoh/NoitaMP/pull/30) ([Ismoh](https://github.com/Ismoh)) +- last commit for now [\#29](https://github.com/Ismoh/NoitaMP/pull/29) ([Ismoh](https://github.com/Ismoh)) +- Develop [\#25](https://github.com/Ismoh/NoitaMP/pull/25) ([Ismoh](https://github.com/Ismoh)) +- Entities [\#24](https://github.com/Ismoh/NoitaMP/pull/24) ([Ismoh](https://github.com/Ismoh)) +- Develop [\#20](https://github.com/Ismoh/NoitaMP/pull/20) ([Ismoh](https://github.com/Ismoh)) +- Updating master [\#18](https://github.com/Ismoh/NoitaMP/pull/18) ([Ismoh](https://github.com/Ismoh)) +- PR needed for codecov coverage [\#17](https://github.com/Ismoh/NoitaMP/pull/17) ([Ismoh](https://github.com/Ismoh)) +- Create CODE\_OF\_CONDUCT.md [\#16](https://github.com/Ismoh/NoitaMP/pull/16) ([Ismoh](https://github.com/Ismoh)) +- Integrate lua unit testing on windows and ubuntu successfully [\#15](https://github.com/Ismoh/NoitaMP/pull/15) ([Ismoh](https://github.com/Ismoh)) +- Unit testing [\#11](https://github.com/Ismoh/NoitaMP/pull/11) ([Ismoh](https://github.com/Ismoh)) +- Update the other branches [\#9](https://github.com/Ismoh/NoitaMP/pull/9) ([Ismoh](https://github.com/Ismoh)) +- Trying to use leafo/gh-actions-lua [\#6](https://github.com/Ismoh/NoitaMP/pull/6) ([Ismoh](https://github.com/Ismoh)) +- Time to be consistent with branches! [\#1](https://github.com/Ismoh/NoitaMP/pull/1) ([Ismoh](https://github.com/Ismoh)) + +## [v2.4.0-alpha+1045](https://github.com/Ismoh/NoitaMP/tree/v2.4.0-alpha+1045) (11.07.2022) + +[Full Changelog](https://github.com/Ismoh/NoitaMP/compare/v2.4.0-alpha+1040...v2.4.0-alpha+1045) + +**Implemented enhancements:** + +- Developer want to add github workflow action to automatically increase the version of NoitaMP [\#42](https://github.com/Ismoh/NoitaMP/issues/42) [[documentation](https://github.com/Ismoh/NoitaMP/labels/documentation)] [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] + +## [v2.4.0-alpha+1040](https://github.com/Ismoh/NoitaMP/tree/v2.4.0-alpha+1040) (11.07.2022) + +[Full Changelog](https://github.com/Ismoh/NoitaMP/compare/e813a6cd0b0605bff8ab8f7a6c51d416e7b4004d...v2.4.0-alpha+1040) + +**Breaking changes:** + +- Developer want to rework NetworkComponents [\#27](https://github.com/Ismoh/NoitaMP/issues/27) [[rework](https://github.com/Ismoh/NoitaMP/labels/rework)] + +**Implemented enhancements:** + +- Misaligned UI positions [\#43](https://github.com/Ismoh/NoitaMP/issues/43) [[bug](https://github.com/Ismoh/NoitaMP/labels/bug)] [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] +- Developer want to add player names in game [\#41](https://github.com/Ismoh/NoitaMP/issues/41) [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] [[help wanted](https://github.com/Ismoh/NoitaMP/labels/help%20wanted)] [[good first issue](https://github.com/Ismoh/NoitaMP/labels/good%20first%20issue)] +- Game crash [\#28](https://github.com/Ismoh/NoitaMP/issues/28) [[bug](https://github.com/Ismoh/NoitaMP/labels/bug)] [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] [[help wanted](https://github.com/Ismoh/NoitaMP/labels/help%20wanted)] +- Rework NUID [\#26](https://github.com/Ismoh/NoitaMP/issues/26) [[bug](https://github.com/Ismoh/NoitaMP/labels/bug)] [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] +- Show players name in game [\#23](https://github.com/Ismoh/NoitaMP/issues/23) [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] [[help wanted](https://github.com/Ismoh/NoitaMP/labels/help%20wanted)] [[good first issue](https://github.com/Ismoh/NoitaMP/labels/good%20first%20issue)] +- Art [\#22](https://github.com/Ismoh/NoitaMP/issues/22) [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] [[help wanted](https://github.com/Ismoh/NoitaMP/labels/help%20wanted)] + +**Fixed bugs:** + +- Client sometimes crashing when projectile collides [\#37](https://github.com/Ismoh/NoitaMP/issues/37) [[bug](https://github.com/Ismoh/NoitaMP/labels/bug)] +- IsDirectory is not reliable. Use lfs? [\#13](https://github.com/Ismoh/NoitaMP/issues/13) [[bug](https://github.com/Ismoh/NoitaMP/labels/bug)] + +**Closed issues:** + +- Add GitHub Workflow for windows-latest [\#14](https://github.com/Ismoh/NoitaMP/issues/14) +- Enable tests in file\_util\_test.lua [\#12](https://github.com/Ismoh/NoitaMP/issues/12) + + + +\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)* From db7ffd79bda89f765c4bf88fe0eade3de5785cda Mon Sep 17 00:00:00 2001 From: Ismoh Date: Sat, 24 Sep 2022 23:32:09 +0200 Subject: [PATCH 11/15] #72 Fixed order of workflow steps, to create first a tag, then updating CHANGELOG.md into the merged branch (github.base_ref) --- .github/workflows/version.yml | 70 +++++++++++++++++------------------ 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index 4161f4d37..ae907de00 100644 --- a/.github/workflows/version.yml +++ b/.github/workflows/version.yml @@ -1,10 +1,10 @@ -name: Increase version on pull request +name: Version and CHANGELOG update on: pull_request: types: [ opened, edited, synchronize, closed ] jobs: find-linked-issues-and-copy-labels-to-pull-request: - name: Copy labels to pull request + name: Copy labels from issue to pull request runs-on: ubuntu-latest outputs: labelNames: $${{ steps.add_labels.outputs.labelNames }} @@ -57,7 +57,7 @@ jobs: LABEL_NAMES: ${{ needs.find-linked-issues-and-copy-labels-to-pull-request.outputs.labelNames }} VERSION_FILE_NAME: 'mods/noita-mp/.version' VERSION_FRAGMENT: 'will be fetched by file' - name: Increase version by labels + name: Increase version depending on labels runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -97,7 +97,7 @@ jobs: echo "FAILURE" exit 1 fi - + generate-or-update-changelog: needs: increase-version-by-labels name: Generate or update CHANGELOG.md @@ -106,8 +106,29 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 - - - name: "Generate CHANGELOG.md" + + - name: Commit and push version changes and tag it, when merged + env: + MERGED: ${{ github.event.pull_request.merged }} + run: | + if [ $MERGED == true ] + then + git fetch + git checkout ${{ github.base_ref }} + git pull origin ${{ github.base_ref }} + echo "$NEXT_VERSION" > $VERSION_FILE_NAME + git config --local user.email "action@github.com" + git config --local user.name "github-actions" + git add $VERSION_FILE_NAME + git commit -m "Updated version to $NEXT_VERSION in https://github.com/${{github.repository}}/pull/${{github.event.number}}" + git tag -a "$NEXT_VERSION" -m "Automatic tag creation, do not consider tags as release. For further technical information, see https://github.com/${{github.repository}}/pull/${{github.event.number}}" + git push origin ${{ github.base_ref }} --tags + else + echo "Pull request is not merged yet, therefore version will not be increased." + fi + + - name: Generate CHANGELOG.md, when merged + if: ${{ github.event.pull_request.merged }} uses: heinrichreimer/github-changelog-generator-action@v2.3 with: token: ${{ secrets.GITHUB_TOKEN }} @@ -115,30 +136,10 @@ jobs: output: "CHANGELOG.md" issueLineLabels: "ALL" breakingLabels: "backwards-incompatible,breaking,rework,refactor" - - - name: Commit and push CHANGELOG.md + + - name: Commit and push CHANGELOG.md, when merged env: CHANGELOG: ${{ needs.generate-or-update-changelog.outputs.changelog }} - run: | - echo "" - cat CHANGELOG.md - echo "" - echo $CHANGELOG - echo "" - ls -R - ls -R ${{ github.workspace }} - - git fetch - git checkout ${{ github.head_ref }} - git pull origin ${{ github.head_ref }} - git config --local user.email "action@github.com" - git config --local user.name "github-actions" - git add CHANGELOG.md - git commit -m "Updated CHANGELOG.md in https://github.com/${{github.repository}}/pull/${{github.event.number}}" - git push origin ${{ github.head_ref }} - - - name: Commit and push version changes and tag it - env: MERGED: ${{ github.event.pull_request.merged }} run: | if [ $MERGED == true ] @@ -146,13 +147,12 @@ jobs: git fetch git checkout ${{ github.base_ref }} git pull origin ${{ github.base_ref }} - echo "$NEXT_VERSION" > $VERSION_FILE_NAME git config --local user.email "action@github.com" git config --local user.name "github-actions" - git add $VERSION_FILE_NAME - git commit -m "Updated version to $NEXT_VERSION in https://github.com/${{github.repository}}/pull/${{github.event.number}}" - git tag -a "$NEXT_VERSION" -m "Automatic tag creation, **do not** consider tags as release. For further **technical** information, see https://github.com/${{github.repository}}/pull/${{github.event.number}}" - git push origin ${{ github.base_ref }} --tags + git add CHANGELOG.md + git commit -m "Updated CHANGELOG.md in https://github.com/${{github.repository}}/pull/${{github.event.number}}" + git push origin ${{ github.base_ref }} else - echo "Pull request is not merged yet, skipping..." - fi \ No newline at end of file + echo "Pull request is not merged yet, therefore CHANGELOG.md will not be updated." + fi + \ No newline at end of file From dff4eac0a1a29931fc31be7873fec7e6872e4077 Mon Sep 17 00:00:00 2001 From: Ismoh Date: Sat, 24 Sep 2022 23:37:02 +0200 Subject: [PATCH 12/15] #72 Changed wording and added version file name. --- .github/workflows/version.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index ae907de00..aa4ee6812 100644 --- a/.github/workflows/version.yml +++ b/.github/workflows/version.yml @@ -1,4 +1,4 @@ -name: Version and CHANGELOG update +name: Version and changelog update on: pull_request: types: [ opened, edited, synchronize, closed ] @@ -100,6 +100,8 @@ jobs: generate-or-update-changelog: needs: increase-version-by-labels + env: + VERSION_FILE_NAME: 'mods/noita-mp/.version' name: Generate or update CHANGELOG.md runs-on: ubuntu-latest steps: @@ -124,7 +126,7 @@ jobs: git tag -a "$NEXT_VERSION" -m "Automatic tag creation, do not consider tags as release. For further technical information, see https://github.com/${{github.repository}}/pull/${{github.event.number}}" git push origin ${{ github.base_ref }} --tags else - echo "Pull request is not merged yet, therefore version will not be increased." + echo "Pull request is not merged yet, therefore '$VERSION_FILE_NAME' will not be increased." fi - name: Generate CHANGELOG.md, when merged From 057eb20a23a3448d1421b6a91fd2ae0e1595aaf5 Mon Sep 17 00:00:00 2001 From: Ismoh Date: Sat, 24 Sep 2022 23:39:20 +0200 Subject: [PATCH 13/15] #72 Removed CHANGELOG.md, because it was generated not correctly. --- CHANGELOG.md | 76 ---------------------------------------------------- 1 file changed, 76 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 8caef7107..000000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,76 +0,0 @@ -# Changelog - -## [Unreleased](https://github.com/Ismoh/NoitaMP/tree/HEAD) - -[Full Changelog](https://github.com/Ismoh/NoitaMP/compare/v2.4.0-alpha+1045...HEAD) - -**Implemented enhancements:** - -- 41 adding name tags [\#46](https://github.com/Ismoh/NoitaMP/pull/46) [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] ([DevonX](https://github.com/DevonX)) -- Function to show players names [\#40](https://github.com/Ismoh/NoitaMP/pull/40) [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] ([DevonX](https://github.com/DevonX)) -- Entities [\#19](https://github.com/Ismoh/NoitaMP/pull/19) [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] ([Ismoh](https://github.com/Ismoh)) -- Fixed networking problems and add lua testing [\#10](https://github.com/Ismoh/NoitaMP/pull/10) [[bug](https://github.com/Ismoh/NoitaMP/labels/bug)] [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] ([Ismoh](https://github.com/Ismoh)) -- Holy moly! sock.lua + lua-enet + enet is working with steam app [\#2](https://github.com/Ismoh/NoitaMP/pull/2) [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] ([Ismoh](https://github.com/Ismoh)) - -**Merged pull requests:** - -- Develop [\#47](https://github.com/Ismoh/NoitaMP/pull/47) ([Ismoh](https://github.com/Ismoh)) -- Master into develop [\#45](https://github.com/Ismoh/NoitaMP/pull/45) ([Ismoh](https://github.com/Ismoh)) -- Develop into master [\#44](https://github.com/Ismoh/NoitaMP/pull/44) ([Ismoh](https://github.com/Ismoh)) -- Develop [\#35](https://github.com/Ismoh/NoitaMP/pull/35) ([Ismoh](https://github.com/Ismoh)) -- Removed lfs file [\#34](https://github.com/Ismoh/NoitaMP/pull/34) ([Ismoh](https://github.com/Ismoh)) -- Merge pull request \#32 from Ismoh/master [\#33](https://github.com/Ismoh/NoitaMP/pull/33) ([Ismoh](https://github.com/Ismoh)) -- master into dev [\#32](https://github.com/Ismoh/NoitaMP/pull/32) ([Ismoh](https://github.com/Ismoh)) -- Develop [\#31](https://github.com/Ismoh/NoitaMP/pull/31) ([Ismoh](https://github.com/Ismoh)) -- Merge pull request \#25 from Ismoh/develop [\#30](https://github.com/Ismoh/NoitaMP/pull/30) ([Ismoh](https://github.com/Ismoh)) -- last commit for now [\#29](https://github.com/Ismoh/NoitaMP/pull/29) ([Ismoh](https://github.com/Ismoh)) -- Develop [\#25](https://github.com/Ismoh/NoitaMP/pull/25) ([Ismoh](https://github.com/Ismoh)) -- Entities [\#24](https://github.com/Ismoh/NoitaMP/pull/24) ([Ismoh](https://github.com/Ismoh)) -- Develop [\#20](https://github.com/Ismoh/NoitaMP/pull/20) ([Ismoh](https://github.com/Ismoh)) -- Updating master [\#18](https://github.com/Ismoh/NoitaMP/pull/18) ([Ismoh](https://github.com/Ismoh)) -- PR needed for codecov coverage [\#17](https://github.com/Ismoh/NoitaMP/pull/17) ([Ismoh](https://github.com/Ismoh)) -- Create CODE\_OF\_CONDUCT.md [\#16](https://github.com/Ismoh/NoitaMP/pull/16) ([Ismoh](https://github.com/Ismoh)) -- Integrate lua unit testing on windows and ubuntu successfully [\#15](https://github.com/Ismoh/NoitaMP/pull/15) ([Ismoh](https://github.com/Ismoh)) -- Unit testing [\#11](https://github.com/Ismoh/NoitaMP/pull/11) ([Ismoh](https://github.com/Ismoh)) -- Update the other branches [\#9](https://github.com/Ismoh/NoitaMP/pull/9) ([Ismoh](https://github.com/Ismoh)) -- Trying to use leafo/gh-actions-lua [\#6](https://github.com/Ismoh/NoitaMP/pull/6) ([Ismoh](https://github.com/Ismoh)) -- Time to be consistent with branches! [\#1](https://github.com/Ismoh/NoitaMP/pull/1) ([Ismoh](https://github.com/Ismoh)) - -## [v2.4.0-alpha+1045](https://github.com/Ismoh/NoitaMP/tree/v2.4.0-alpha+1045) (11.07.2022) - -[Full Changelog](https://github.com/Ismoh/NoitaMP/compare/v2.4.0-alpha+1040...v2.4.0-alpha+1045) - -**Implemented enhancements:** - -- Developer want to add github workflow action to automatically increase the version of NoitaMP [\#42](https://github.com/Ismoh/NoitaMP/issues/42) [[documentation](https://github.com/Ismoh/NoitaMP/labels/documentation)] [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] - -## [v2.4.0-alpha+1040](https://github.com/Ismoh/NoitaMP/tree/v2.4.0-alpha+1040) (11.07.2022) - -[Full Changelog](https://github.com/Ismoh/NoitaMP/compare/e813a6cd0b0605bff8ab8f7a6c51d416e7b4004d...v2.4.0-alpha+1040) - -**Breaking changes:** - -- Developer want to rework NetworkComponents [\#27](https://github.com/Ismoh/NoitaMP/issues/27) [[rework](https://github.com/Ismoh/NoitaMP/labels/rework)] - -**Implemented enhancements:** - -- Misaligned UI positions [\#43](https://github.com/Ismoh/NoitaMP/issues/43) [[bug](https://github.com/Ismoh/NoitaMP/labels/bug)] [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] -- Developer want to add player names in game [\#41](https://github.com/Ismoh/NoitaMP/issues/41) [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] [[help wanted](https://github.com/Ismoh/NoitaMP/labels/help%20wanted)] [[good first issue](https://github.com/Ismoh/NoitaMP/labels/good%20first%20issue)] -- Game crash [\#28](https://github.com/Ismoh/NoitaMP/issues/28) [[bug](https://github.com/Ismoh/NoitaMP/labels/bug)] [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] [[help wanted](https://github.com/Ismoh/NoitaMP/labels/help%20wanted)] -- Rework NUID [\#26](https://github.com/Ismoh/NoitaMP/issues/26) [[bug](https://github.com/Ismoh/NoitaMP/labels/bug)] [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] -- Show players name in game [\#23](https://github.com/Ismoh/NoitaMP/issues/23) [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] [[help wanted](https://github.com/Ismoh/NoitaMP/labels/help%20wanted)] [[good first issue](https://github.com/Ismoh/NoitaMP/labels/good%20first%20issue)] -- Art [\#22](https://github.com/Ismoh/NoitaMP/issues/22) [[enhancement](https://github.com/Ismoh/NoitaMP/labels/enhancement)] [[help wanted](https://github.com/Ismoh/NoitaMP/labels/help%20wanted)] - -**Fixed bugs:** - -- Client sometimes crashing when projectile collides [\#37](https://github.com/Ismoh/NoitaMP/issues/37) [[bug](https://github.com/Ismoh/NoitaMP/labels/bug)] -- IsDirectory is not reliable. Use lfs? [\#13](https://github.com/Ismoh/NoitaMP/issues/13) [[bug](https://github.com/Ismoh/NoitaMP/labels/bug)] - -**Closed issues:** - -- Add GitHub Workflow for windows-latest [\#14](https://github.com/Ismoh/NoitaMP/issues/14) -- Enable tests in file\_util\_test.lua [\#12](https://github.com/Ismoh/NoitaMP/issues/12) - - - -\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)* From 69481cda0b45ccc54359ec5d7f412c26b765b44f Mon Sep 17 00:00:00 2001 From: Ismoh Date: Sat, 24 Sep 2022 23:42:00 +0200 Subject: [PATCH 14/15] #72 Removed not working changelog-generator.yml. Renamed version.yml to version-and-changelog-update.yml. --- .github/workflows/changelog-generator.yml | 17 ----------------- ...ion.yml => version-and-changelog-update.yml} | 0 2 files changed, 17 deletions(-) delete mode 100644 .github/workflows/changelog-generator.yml rename .github/workflows/{version.yml => version-and-changelog-update.yml} (100%) diff --git a/.github/workflows/changelog-generator.yml b/.github/workflows/changelog-generator.yml deleted file mode 100644 index 1478f0979..000000000 --- a/.github/workflows/changelog-generator.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Changelog -on: - release: - types: - - created -jobs: - changelog: - runs-on: ubuntu-latest - steps: - - name: "✏ Generate release or tag changelog" - uses: heinrichreimer/github-changelog-generator-action@v2.3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - dateFormat: "%d.%m.%Y" - output: "CHANGELOG.md" - issueLineLabels: "ALL" - breakingLabels: "backwards-incompatible,breaking,rework,refactor" \ No newline at end of file diff --git a/.github/workflows/version.yml b/.github/workflows/version-and-changelog-update.yml similarity index 100% rename from .github/workflows/version.yml rename to .github/workflows/version-and-changelog-update.yml From a6955f1906857f0010dd13803b35f0192f59e14a Mon Sep 17 00:00:00 2001 From: Ismoh Date: Sat, 24 Sep 2022 23:47:14 +0200 Subject: [PATCH 15/15] #72 Changed wording and order of steps for a better reading --- .../version-and-changelog-update.yml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/version-and-changelog-update.yml b/.github/workflows/version-and-changelog-update.yml index aa4ee6812..a8159d0e5 100644 --- a/.github/workflows/version-and-changelog-update.yml +++ b/.github/workflows/version-and-changelog-update.yml @@ -51,13 +51,13 @@ jobs: echo "::set-output name=labelNames::${labelNames}" - increase-version-by-labels: + update-version: needs: find-linked-issues-and-copy-labels-to-pull-request env: LABEL_NAMES: ${{ needs.find-linked-issues-and-copy-labels-to-pull-request.outputs.labelNames }} VERSION_FILE_NAME: 'mods/noita-mp/.version' VERSION_FRAGMENT: 'will be fetched by file' - name: Increase version depending on labels + name: Increase version and create a tag, when merged runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -98,17 +98,6 @@ jobs: exit 1 fi - generate-or-update-changelog: - needs: increase-version-by-labels - env: - VERSION_FILE_NAME: 'mods/noita-mp/.version' - name: Generate or update CHANGELOG.md - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Commit and push version changes and tag it, when merged env: MERGED: ${{ github.event.pull_request.merged }} @@ -128,6 +117,17 @@ jobs: else echo "Pull request is not merged yet, therefore '$VERSION_FILE_NAME' will not be increased." fi + + update-changelog: + needs: update-version + env: + VERSION_FILE_NAME: 'mods/noita-mp/.version' + name: Update CHANGELOG.md, when merged + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 - name: Generate CHANGELOG.md, when merged if: ${{ github.event.pull_request.merged }} @@ -141,7 +141,7 @@ jobs: - name: Commit and push CHANGELOG.md, when merged env: - CHANGELOG: ${{ needs.generate-or-update-changelog.outputs.changelog }} + CHANGELOG: ${{ needs.update-changelog.outputs.changelog }} MERGED: ${{ github.event.pull_request.merged }} run: | if [ $MERGED == true ]