Merge branch 'master' into painres

Dan1ss1mo · Mar 8, 2023 · f178740 · f178740
2 parents 9e352aa + 2579396
commit f178740
Show file tree

Hide file tree

Showing 1,116 changed files with 520,187 additions and 294,122 deletions.
diff --git a/.github/workflows/assign_mission_target_needs_om_special.yml b/.github/workflows/assign_mission_target_needs_om_special.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - '**.json'
 
+permissions:
+  contents: read
+
 jobs:
   run-the-tool:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/check-translation.yml b/.github/workflows/check-translation.yml
@@ -6,6 +6,9 @@ on:
       - 'lang/po/*.po'
       - 'tools/check_po_printf_format.py'
 
+permissions:
+  contents: read
+
 jobs:
   check-po-printf:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/cmake-format.yml b/.github/workflows/cmake-format.yml
@@ -16,6 +16,9 @@ on:
     - '**.cmake'
     - '**.cmake.in'
 
+permissions:
+  contents: read
+
 jobs:
   check:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/detect-translation-file-changes.yml b/.github/workflows/detect-translation-file-changes.yml
@@ -2,9 +2,7 @@ name: Detect translation file changes
 
 
 on:
-  pull_request:
-    branches:
-      - master
+  pull_request_target:
     paths:
       - lang/po/*.po
       - lang/po/*.pot

diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml
@@ -12,6 +12,9 @@ on:
     paths:
     - '**.py'
 
+permissions:
+  contents: read
+
 jobs:
   check:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -2,8 +2,14 @@ name: "Pull Request Labeler"
 on:
   - pull_request_target
 
+permissions:
+  contents: read
+
 jobs:
   triage:
+    permissions:
+      contents: read  # for actions/labeler to determine modified files
+      pull-requests: write  # for actions/labeler to add labels to PRs
     runs-on: ubuntu-latest
     steps:
       - uses: actions/labeler@v3

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -31,10 +31,11 @@ jobs:
 
     - run: sudo apt-get install astyle
 
-    - run: make astyle-check && make astyle-fast && make style-all-json-parallel
+    - run: make astyle-fast
+    - run: make style-all-json-parallel
 
     - name: 'suggester / JSON & C++'
       uses: reviewdog/action-suggester@v1
-      if: ${{ failure() }}
+      if: ${{ always() }}
       with:
         tool_name: 'JSON & C++ formatters'
diff --git a/.github/workflows/matrix.yml b/.github/workflows/matrix.yml
@@ -59,6 +59,8 @@ jobs:
         with:
           paths_ignore: '["android/**", "build-data/osx/**", "doc/**", "doxygen_doc/**", "lgtm/**", "msvc-**", "object_creator/**", "tools/**", "utilities/**"]'
   matrix-variables:
+    permissions:
+      contents: none
     continue-on-error: true
     runs-on: ubuntu-latest
     outputs:
@@ -169,9 +171,9 @@ jobs:
             sound: 1
             localize: 1
             libbacktrace: 1
-            title: GCC 11, Ubuntu cross-compile to MinGW-Win64, Tiles, Sound
+            title: GCC 12, Ubuntu cross-compile to MinGW-Win64, Tiles, Sound
             ldflags: -static-libgcc -static-libstdc++
-            mxe_target: x86_64-w64-mingw32.static.gcc11
+            mxe_target: x86_64-w64-mingw32.static.gcc12
             wine: wine
             # ~285MB in a clean build
             # ~36MB compressed

diff --git a/.github/workflows/msvc-full-features.yml b/.github/workflows/msvc-full-features.yml
@@ -81,7 +81,7 @@ jobs:
         # availability only as an x86 host tool. Keep it in sync with the builtin-baseline
         # field in vcpkg.json. Caching happens as a post-action which runs at the end of
         # the whole workflow, after vcpkg install happens during msbuild run.
-        vcpkgGitCommitId: '12b7cfe6109a9d68319334b56a01c44a302a13b6'
+        vcpkgGitCommitId: 'a7b6122f6b6504d16d96117336a0562693579933'
 
     - name: Integrate vcpkg
       run: |

diff --git a/.github/workflows/push-translation-template.yml b/.github/workflows/push-translation-template.yml
@@ -9,6 +9,9 @@ on:
       - completed
 
 
+permissions:
+  contents: read
+
 jobs:
   push-template:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -234,7 +234,7 @@ jobs:
           # availability only as an x86 host tool. Keep it in sync with the builtin-baseline
           # field in vcpkg.json. Caching happens as a post-action which runs at the end of
           # the whole workflow, after vcpkg install happens during msbuild run.
-          vcpkgGitCommitId: '12b7cfe6109a9d68319334b56a01c44a302a13b6'
+          vcpkgGitCommitId: 'a7b6122f6b6504d16d96117336a0562693579933'
       - name: Install dependencies (windows msvc) (3/3)
         if: runner.os == 'Windows'
         run: |
@@ -246,13 +246,16 @@ jobs:
       - name: Install MXE
         if: matrix.mxe != 'none'
         run: |
-          curl -L -o mxe-${{ matrix.mxe }}.tar.xz https://github.com/BrettDong/MXE-GCC/releases/download/mxe-gcc-11.2/mxe-${{ matrix.mxe }}.tar.xz
-          curl -L -o mxe-${{ matrix.mxe }}.tar.xz.sha256 https://github.com/BrettDong/MXE-GCC/releases/download/mxe-gcc-11.2/mxe-${{ matrix.mxe }}.tar.xz.sha256
+          curl -L -o mxe-${{ matrix.mxe }}.tar.xz https://github.com/BrettDong/MXE-GCC/releases/download/mxe-sdl-2-0-20/mxe-${{ matrix.mxe }}.tar.xz
+          curl -L -o mxe-${{ matrix.mxe }}.tar.xz.sha256 https://github.com/BrettDong/MXE-GCC/releases/download/mxe-sdl-2-0-20/mxe-${{ matrix.mxe }}.tar.xz.sha256
           shasum -a 256 -c ./mxe-${{ matrix.mxe }}.tar.xz.sha256
           sudo tar xJf mxe-${{ matrix.mxe }}.tar.xz -C /opt
+          curl -L -o SDL2-devel-2.26.2-mingw.tar.gz https://github.com/libsdl-org/SDL/releases/download/release-2.26.2/SDL2-devel-2.26.2-mingw.tar.gz
+          shasum -a 256 -c ./build-scripts/SDL2-devel-2.26.2-mingw.tar.gz.sha256
+          sudo tar -xzf SDL2-devel-2.26.2-mingw.tar.gz -C /opt/mxe/usr/${{ matrix.mxe }}-w64-mingw32.static.gcc12 --strip-components=2 SDL2-2.26.2/${{ matrix.mxe }}-w64-mingw32
           curl -L -o libbacktrace-${{ matrix.mxe }}-w64-mingw32.tar.gz https://github.com/Qrox/libbacktrace/releases/download/2020-01-03/libbacktrace-${{ matrix.mxe }}-w64-mingw32.tar.gz
           shasum -a 256 -c ./build-scripts/libbacktrace-${{ matrix.mxe }}-w64-mingw32-sha256
-          sudo tar -xzf libbacktrace-${{ matrix.mxe }}-w64-mingw32.tar.gz --exclude=LICENSE -C /opt/mxe/usr/${{ matrix.mxe }}-w64-mingw32.static.gcc11
+          sudo tar -xzf libbacktrace-${{ matrix.mxe }}-w64-mingw32.tar.gz --exclude=LICENSE -C /opt/mxe/usr/${{ matrix.mxe }}-w64-mingw32.static.gcc12
       - name: Install dependencies (Linux)
         if: runner.os == 'Linux' && matrix.mxe == 'none' && matrix.android == 'none' 
         run: |
@@ -286,7 +289,7 @@ jobs:
       - name: Build CDDA (windows mxe)
         if: matrix.mxe != 'none'
         env:
-          PLATFORM: /opt/mxe/usr/bin/${{ matrix.mxe }}-w64-mingw32.static.gcc11-
+          PLATFORM: /opt/mxe/usr/bin/${{ matrix.mxe }}-w64-mingw32.static.gcc12-
         run: |
           make -j$((`nproc`+0)) CROSS="${PLATFORM}" TILES=1 SOUND=1 RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=1 PCH=0 bindist
           mv cataclysmdda-0.F.zip cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.zip

diff --git a/.github/workflows/text-changes-analyzer.yml b/.github/workflows/text-changes-analyzer.yml
@@ -15,6 +15,9 @@ on:
       - '**.json'
 
 
+permissions:
+  contents: read
+
 jobs:
   analyze-text-changes:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/toc.yml b/.github/workflows/toc.yml
@@ -5,6 +5,9 @@ on:
     paths:
     - 'doc/JSON_INFO.md'
 name: TOC Generator
+permissions:
+  contents: read
+
 jobs:
   generateTOC:
     if: github.repository == 'CleverRaven/Cataclysm-DDA'

diff --git a/.github/workflows/update-tilesets.yml b/.github/workflows/update-tilesets.yml
@@ -14,26 +14,6 @@ jobs:
     if: github.repository == 'CleverRaven/Cataclysm-DDA'
     runs-on: ubuntu-latest
     steps:
-      - name: "Generate PR body/tileset update changelog"
-        id: pr-changelog
-        run: |
-          printf '#### Summary\nNone\n\nAutomatic tilesets updates from:\n\n#### https://github.com/I-am-Erk/CDDA-Tilesets\n' >> pr-body
-          gh release view -R I-am-Erk/CDDA-Tilesets --json body --jq .body >> pr-body
-          echo "---" >> pr-body
-          printf '#### https://github.com/pixel-32/CDDA-tileset\n' >> pr-body
-          gh release view -R pixel-32/CDDA-tileset --json body --jq .body >> pr-body
-          sed -i "s/## What's Changed/**What's Changed**/g" pr-body
-          sed -i "s/## New Contributors/**New Contributors**/g" pr-body
-          sed -i '/Full Changelog/d' pr-body
-
-          CHANGELOG=$(cat pr-body)
-          CHANGELOG="${CHANGELOG//'%'/'%25'}"
-          CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
-          CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
-
-          echo "pr-body=$CHANGELOG" >> $GITHUB_OUTPUT
-          rm -f pr-body
-
       - uses: actions/checkout@v3
       - name: "Get current date"
         uses: 1466587594/get-current-time@v2
@@ -65,4 +45,4 @@ jobs:
           delete-branch: true
           base: master
           title: Routine tileset updates on ${{ steps.current-date.outputs.formattedTime }}
-          body: ${{ steps.pr-changelog.outputs.pr-body }}
+          body: "#### Summary\nNone\nAutomatic tileset updates from:\n\n**https://github.com/I-am-Erk/CDDA-Tilesets/releases**\nAltica, BrownLikeBears, ChibiUltica, HollowMoon, Larwick_Overmap, MshockXotto+, NeoDaysTileset, RetroDaysTileset, SmashButton_iso, SurveyorsMap\n\n---\n\n**https://github.com/pixel-32/CDDA-tileset/releases**\nCuteclysm"
diff --git a/.github/workflows/weekly-changelog.yml b/.github/workflows/weekly-changelog.yml
@@ -0,0 +1,50 @@
+name: "Weekly changelog update"
+
+on:
+  schedule:
+    - cron: "45 0 * * 1"
+  push:
+    branches:
+      - master
+    paths:
+      - '.github/workflows/weekly-changelog.yml'
+
+jobs:
+  weekly-changelog:
+    if: github.repository == 'CleverRaven/Cataclysm-DDA'
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v2
+      - name: "Get current date"
+        uses: 1466587594/get-current-time@v2
+        id: current-date
+        with:
+          format: 'YYYYMMDD'
+      - name: "Get changes since last week"
+        id: getting-changes
+        env:
+          CURR_DATE: ${{ steps.current-date.outputs.formattedTime }}
+        run: |
+          LAST_WEEK="$(date -d "@$(( $(date +%s -d $CURR_DATE) - (60*60*24*7) ))" +"%Y-%m-%d")"
+          tools/generate_changelog.py -f --by-date /tmp/changelog.txt -T "${{ secrets.TX_TOKEN }}" "$LAST_WEEK"
+          tac /tmp/changelog.txt > /tmp/changelog_rev.txt
+          tools/merge_summaries.sh /tmp/changelog_rev.txt data/changelog.txt
+          echo "date=$( date +"%Y-%m-%d" -d $CURR_DATE )" >> $GITHUB_OUTPUT
+          echo "old_date=$LAST_WEEK" >> $GITHUB_OUTPUT
+      - name: Create Pull Request
+        uses: peter-evans/[email protected]
+        with:
+          commit-message: Weekly Changelog ${{ steps.getting-changes.outputs.old_date }} to ${{ steps.getting-changes.outputs.date }}
+          committer: David Seguin <[email protected]>
+          author: David Seguin <[email protected]>
+          token: ${{ secrets.TX_PR_CREATOR }}
+          branch: changelog-weekly
+          delete-branch: true
+          base: master
+          title: Weekly Changelog ${{ steps.getting-changes.outputs.old_date }} to ${{ steps.getting-changes.outputs.date }}
+          body: "#### Summary\nNone\n\n#### Additional context\n`Automatically generated as a draft. Please copy-edit before merging.`"
+          labels: Organization,<Documentation>
+          # create as a draft to allow maintainers to cull the changes before merging
+          draft: true
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,9 @@ on: @@
         paths:
         - '**.py'
+    permissions:
+      contents: read
     jobs:
       check:
         runs-on: ubuntu-latest
@@ Expand Down @@