Updating master with develop (#74)

* Clean up 2 in Developer want to rework NetworkComponents #27 * Clean up 3 in Developer want to rework NetworkComponents #27 * Developer want to rework NetworkComponents #27 Trying to fix workflows. * Developer want to rework NetworkComponents #27 Trying to fix workflows. 2 * Developer want to rework NetworkComponents #27 Trying to fix workflows. 3 * Developer want to rework NetworkComponents #27 Trying to fix workflows. 4 * Developer want to rework NetworkComponents #27 Trying to fix workflows. 5 * Developer want to rework NetworkComponents #27 Trying to fix workflows. 6 * #27 Trying to fix workflows. 6 * #27 Trying to fix workflows. 8 * #27 Trying to fix workflows. 9 * #27 Trying to fix workflows. 10 * #27 Trying to fix workflows. 11 * #27 Trying to fix workflows. 12 * #27 Trying to fix workflows. 13 * #27 Trying to fix workflows. 14 * #27 Trying to fix workflows. 15 * #27 Trying to fix workflows. 16 * #27 Trying to fix workflows. 17 * #27 Trying to fix workflows. 18 * #27 Trying to fix workflows. 19 * #27 Trying to fix workflows. 20 * #27 Trying to fix workflows. 21 * #27 Trying to fix workflows. 22 * #27 Trying to fix workflows. 23 * #27 Trying to fix workflows. 24 * #27 Trying to fix workflows. 25 * #27 Trying to fix workflows. 26 * #27 Trying to fix workflows. 28 * #27 Trying to fix workflows. 28 * #27 Trying to fix workflows. 29 * #27 Trying to fix workflows. 30 * #27 Trying to fix workflows. 31 * Bump codecov/codecov-action from 2 to 3 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 2 to 3. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md) - [Commits](codecov/codecov-action@v2...v3) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * #42 Trying to get associated issue and its labels * #42 list context * #42 changed trigger * #42 using github cli "gh" * #42 using github cli "gh" 2 * #42 using github cli "gh" 3 * #42 using github cli "gh" 4 * #42 Using curl for fetching issue labels * #42 Using curl for fetching issue labels 2 * #42 Using curl for fetching issue labels 3 * #42 Using curl for fetching issue labels 4 * #42 Using curl for fetching issue labels 5 * #42 Using curl for fetching issue labels 6 * #42 Using curl for fetching issue labels 7 * #42 Using curl for fetching issue labels 8 * #42 Using curl for fetching issue labels 9 * #42 Using curl for fetching issue labels 10 * #42 Using curl for fetching issue labels 11 * #42 Using curl for fetching issue labels 12 * #42 Using curl for fetching issue labels 13 * #42 Using curl for fetching issue labels 14 * #42 Using curl for fetching issue labels 15 * #42 Using curl for fetching issue labels 16 * #42 Using curl for fetching issue labels 17 * #42 Using curl for fetching issue labels 18 * #42 Using curl for fetching issue labels 19 * #42 Using curl for fetching issue labels 20 * #42 Using curl for fetching issue labels 21 * #42 Changed in game menu icon * #42 Changed in game menu icon 2 * #42 Trying to add label to pr/issue * #42 Trying to add label to pr/issue 2 * #42 Trying to add label to pr/issue 3 * #42 Trying to add label to pr/issue 4 * #42 GitHub copilot is going crazy! * #42 GitHub copilot is going crazy! 2 * #42 GitHub copilot is going crazy! 3 * #42 GitHub copilot is going crazy! 4 * #42 GitHub copilot is going crazy! 5 * #42 GitHub copilot is going crazy! 6 * #42 GitHub copilot is going crazy! 7 * #42 GitHub copilot is going crazy! 8 * #42 GitHub copilot is going crazy! 9 * #42 GitHub copilot is going crazy! 10 * #42 GitHub copilot is going crazy! 11 * #42 GitHub copilot is going crazy! 12 * #42 GitHub copilot is going crazy! 13 * #42 GitHub copilot is going crazy! 14 * #42 GitHub copilot is going crazy! 15 * #42 GitHub copilot is going crazy! 16 * #42 GitHub copilot is going crazy! 17 * #42 GitHub copilot is going crazy! 18 * #42 GitHub copilot is going crazy! 19 * #42 GitHub copilot is going crazy! 20 * #42 GitHub copilot is going crazy! 21 * #42 GitHub copilot is going crazy! 22 * #42 GitHub copilot is going crazy! 23 * #42 GitHub copilot is going crazy! 24 * #42 GitHub copilot is going crazy! 25 * #42 GitHub copilot is going crazy! 26 * #42 GitHub copilot is going crazy! 27 * #42 GitHub copilot is going crazy! 28 * #42 GitHub copilot is going crazy! 29 * #42 GitHub copilot is going crazy! 30 * #42 GitHub copilot is going crazy! 31 * #42 GitHub copilot is going crazy! 32 * #42 GitHub copilot is going crazy! 33 * #42 Let's try 'curl'! * #42 Let's try 'curl'! 2 * #42 Let's try 'curl'! 3 * #42 Let's try 'curl'! 4 * #42 Let's try 'curl'! 5 * #42 Let's try 'curl'! 6 * #42 Let's try 'curl'! 7 * #42 Let's try 'curl'! 8 * #42 Let's try 'curl'! 9 * #42 Let's try 'curl'! 10 * #42 Let's try 'curl'! 11 * #42 Let's try 'curl'! 11 * #42 Let's try 'curl'! 12 * #42 Let's try 'curl'! 13 * #42 Let's try 'curl'! 14 * #42 Let's try 'curl'! 15 * #42 Let's try 'curl'! 16 * #42 Let's try 'curl'! 17 * #42 Let's try 'curl'! 18 * #42 Let's try 'curl'! 19 * #42 Let's try 'curl'! 20 * #42 Let's try 'curl'! 21 * #42 Let's try 'curl'! 22 * #42 Let's try 'curl'! 23 * #42 Let's try to increase version * #42 Let's try to increase version 2 * #42 Let's try to increase version 3 * #42 Let's try to increase version 4 * #42 Let's try to increase version 5 * #42 Let's try to increase version 6 * #42 Let's try to increase version 7 * #42 Let's try to increase version 8 * #42 Let's try to increase version 9 * #42 Trying GitHubs output * #42 Trying GitHubs output 2 * #42 Found the issue regarding "syntax error near unexpected token `newline'" * #42 Still getting "syntax error near unexpected token `newline'"! Change bash command * #42 Syntax error? * #42 Oh missed some adjustment for naming. Fixed missed variable names. * #42 Looks like GitHub copilot isn't smart enough. * #42 And again: Looks like GitHub copilot isn't smart enough. * #42 "Unable to parse version: v2.3.1-alpha+894; please check your version syntax, refer: https://semver.org/" * #42 Added version file extraction pattern. * #42 Fixing not necessary $ in labelNames. * #42 Trying to commit and push changed version to the specific pull request. * #42 labelNames wasn't set. git push didn't work, because no branch was checked out? "fatal: You are not currently on a branch. To push the history leading to the current (detached HEAD). state now, use 'git push origin HEAD:<name-of-remote-branch>'" * #42 Trying to get the branch name within github action. * #42 Found the head_ref branch name. Is '$' necessary? * #42 '$' is necessary! * #42 Adding commits count to version! * #42 "[detached HEAD 1345a7c] Updated version of this PR to 2.4.0-alpha. 1 file changed, 1 insertion(+), 1 deletion(-) To https://github.com/Ismoh/NoitaMP ! [rejected] HEAD -> 42-developer-want-to-add-github-workflow-action-to-automatically-increase-the-version-of-noitamp (fetch first) error: failed to push some refs to 'https://github.com/Ismoh/NoitaMP' hint: Updates were rejected because the remote contains work that you do hint: not have locally. This is usually caused by another repository pushing hint: to the same ref. You may want to first integrate the remote changes hint: (e.g., 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details." * #42 "You are not currently on a branch. Please specify which branch you want to merge with. See git-pull(1) for details. git pull <remote> <branch>" * #42 "You have divergent branches and need to specify how to reconcile them." Use ref for using the merge and not the initial branch * #42 Does "actions/checkout@v3" help? * #42 Error: .github#L1: a step cannot have both the `uses` and `run` keys * #42 You are not currently on a branch. Please specify which branch you want to merge with. See git-pull(1) for details. git pull <remote> <branch> * #42 You are not currently on a branch. Please specify which branch you want to merge with. See git-pull(1) for details. git pull <remote> <branch> 2 * Updated version of this PR to 2.4.0-alpha * #42 It's working fine, besides overwriting .version file. Should work now. * Updated version of this PR to 2.4.0-alpha * #42 I want githubs icon on the commit * Updated version of this PR to 2.5.0-alpha * #42 Fixed version * #42 Doesnt work when merged * #42 Use base ref instead. * #42 Adding comment to the pull request. * #42 Fixing syntax. * #42 Fixing syntax 2 * #42 Fixing syntax 3 * #42 Fixing syntax 4 * #42 Fixing syntax 5 * #42 Fixing syntax 6 * #42 Fixing syntax 7 * #42 Fixing syntax 8 * #42 Fixing syntax 9 * #42 Fixing syntax 10 * #42 Fixing syntax 11 * #42 Fixing syntax 12 * #42 Fixing syntax 13 * #42 Escaping everything! * #42 Escaping everything! doesnt help * #42 Escaping everything! doesnt help 2 * #42 Escaping everything! doesnt help 3 * #42 Escaping everything! doesnt help 4 * #42 Found the issue. * #42 Found the issue. 2 * #42 Found the issue. 3 * #42 Found the issue. 4 * #42 Found the issue. 5 * #42 polishing * #42 polishing 2 * #42 polishing 3 * #42 Colon is fycking up the json body. * #42 Colon is fycking up the json body. 2 * #42 Colon is fycking up the json body. 3 * #42 Colon is fycking up the json body. 4 * #42 Triple escape characters. * #42 Head ref doesnt exist, after merge. * #42 merged flag is false? * #42 merged flag is false? * #42 merged flag is false? 2 * #42 merged flag is false? 2 * Updated version of #65 to v2.4.0-alpha+1040 * #42 Polishing! * #42 Made a mistake. Fixing version manually. * Updated version to v2.4.0-alpha+1045 in #66 * Bump HardNorth/github-version-generate from 1.1.2 to 1.2.0 Bumps [HardNorth/github-version-generate](https://github.com/HardNorth/github-version-generate) from 1.1.2 to 1.2.0. - [Release notes](https://github.com/HardNorth/github-version-generate/releases) - [Changelog](https://github.com/HardNorth/github-version-generate/blob/develop/CHANGELOG.md) - [Commits](HardNorth/github-version-generate@v1.1.2...v1.2.0) --- updated-dependencies: - dependency-name: HardNorth/github-version-generate dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * #72 Added changelog generator in a separated yaml file and in version.yml. * #72 Removed changelog generator in version.yml. * #72 Fixed non-existing tag key in changelog-generator.yml * #72 Added changelog generator to version.yml * #72 Fixed not working changelog generator workflow action. * #72 Trying to get the directories working?! * #72 Still trying to find out, where CHANGELOG.md is created. * #72 Typo in yaml. * #72 Changed branch from github.base_ref to github.head_ref, because CHANGELOG.md has to be changed in the PR-branch itself. * Updated CHANGELOG.md in #73 * #72 Fixed order of workflow steps, to create first a tag, then updating CHANGELOG.md into the merged branch (github.base_ref) * #72 Changed wording and added version file name. * #72 Removed CHANGELOG.md, because it was generated not correctly. * #72 Removed not working changelog-generator.yml. Renamed version.yml to version-and-changelog-update.yml. * #72 Changed wording and order of steps for a better reading * Updated version to v2.5.0-alpha+1065 in #73 * Updated CHANGELOG.md in #73 Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions <[email protected]> Co-authored-by: github-actions <[email protected]> Co-authored-by: github-actions <[email protected]>
Ismoh · Sep 24, 2022 · 0f436ed · 0f436ed
1 parent 8364be4
commit 0f436ed
Show file tree

Hide file tree

Showing 83 changed files with 4,337 additions and 525 deletions.
diff --git a/.debug/debug noita.deuser b/.debug/debug noita.deuser
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project>
-  <command>C:\Program Files (x86)\Steam\steamapps\common\Noita\noita_dev.exe</command>
+  <command>C:\Program Files (x86)\Steam\steamapps\common\Noita\noita_dev_log.exe</command>
   <working_directory>C:\Program Files (x86)\Steam\steamapps\common\Noita</working_directory>
   <symbols_directory></symbols_directory>
   <command_arguments>-debug_lua</command_arguments>

diff --git a/.debug/run-noita.bat b/.debug/run-noita.bat
@@ -0,0 +1,18 @@
+@REM setlocal enabledelayedexpansion
+
+@REM FOR /f "tokens=2 delims==" %%d IN ('wmic logicaldisk where "drivetype=3" get name /format:value') DO (
+
+@REM     echo %%d
+@REM     cd /d %%d
+
+@REM     for /f "tokens=* delims=" %%a in ('dir /s /b noita.exe') do set "noita_exe=%%a"
+@REM     echo %%noita_exe%%=%noita_exe%
+
+@REM     for /f "tokens=*" %%a in ('dir /s /b noita_dev.exe') do set "noita_dev_exe=%%a"
+@REM     echo %%noita_dev_exe%%=%noita_dev_exe%
+@REM )
+
+@REM endlocal
+
+start "" "C:\Program Files (x86)\Steam\steamapps\common\Noita\noita.exe"
+start "" "C:\Program Files (x86)\Steam\steamapps\common\Noita\noita_dev.exe" -lua_debug
diff --git a/.github/NoitaMP-logo.png b/.github/NoitaMP-logo.png
diff --git a/.github/workflows/ubuntu-latest-lua-unit-testing.yml b/.github/workflows/ubuntu-latest-lua-unit-testing.yml
@@ -82,7 +82,7 @@ jobs:
         rm ${{ github.workspace }}/luarocks-3.8.0/.codecov.yml
 
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v3
       with:
         directory: ${{ github.workspace }}
         flags: unittesting

diff --git a/.github/workflows/version-and-changelog-update.yml b/.github/workflows/version-and-changelog-update.yml
@@ -0,0 +1,160 @@
+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 from issue to pull request
+    runs-on: ubuntu-latest
+    outputs:
+      labelNames: $${{ steps.add_labels.outputs.labelNames }}
+    steps:
+      - name: Find linked issues
+        id: links
+        uses: hossainemruz/linked-issues@main
+        with:
+          pr_url: ${{github.event.pull_request.html_url}}
+          format: IssueNumber
+
+      - name: Add labels of associated/linked issue to the pull request
+        id: add_labels
+        run: |
+          for issueNumber in ${{ steps.links.outputs.issues }}
+          do
+            issueUrl=$( echo ${{ github.event.pull_request.base.repo.issues_url }} | sed "s/{\/number}/\/$issueNumber/g" )
+            labels=$( curl $issueUrl | jq '.labels')
+            echo "labels="$labels
+        
+            for label in $( echo $labels | jq -r '.[] | .name' )
+            do
+              labelNames="${labelNames:+$labelNames,}\"$label\""
+            done
+        
+          done
+          echo "labelNames="$labelNames
+          data="{\"labels\":[${labelNames}]}"
+        
+          curlResponse=`curl --write-out '%{http_code}' --output /dev/null --request POST \
+          --header 'Accept: application/vnd.github.v3+json' \
+          --header 'Authorization: token ${{ github.token }}' \
+          --header 'Content-Type: application/json' \
+          --url 'https://api.github.com/repos/${{github.repository}}/issues/${{github.event.number}}/labels' \
+          --data-raw $data`
+        
+          if [[ $curlResponse == *"200"* ]]
+          then
+            echo "SUCCESS"
+          else
+            echo "FAILURE"
+            exit 1
+          fi
+        
+          echo "::set-output name=labelNames::${labelNames}"
+  
+  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 and create a tag, when merged
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Increase version depending on labels
+        uses: HardNorth/[email protected]
+        with:
+          version-source: file
+          version-file: ${{ env.VERSION_FILE_NAME }}
+          version-file-extraction-pattern: '^v(.*)'
+          next-version-increment-major: ${{ contains(env.LABEL_NAMES, 'rework') }}
+          next-version-increment-minor: ${{ contains(env.LABEL_NAMES, 'enhancement') }}
+          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"
+          else
+            echo "FAILURE"
+            exit 1
+          fi
+  
+      - 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 "[email protected]"
+            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_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 }}
+        uses: heinrichreimer/[email protected]
+        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, when merged
+        env:
+          CHANGELOG: ${{ needs.update-changelog.outputs.changelog }}
+          MERGED: ${{ github.event.pull_request.merged }}
+        run: |
+          if [ $MERGED == true ]
+          then
+            git fetch
+            git checkout ${{ github.base_ref }}
+            git pull origin ${{ github.base_ref }}
+            git config --local user.email "[email protected]"
+            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 }}
+          else
+            echo "Pull request is not merged yet, therefore CHANGELOG.md will not be updated."
+          fi
+