Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -19,7 +19,7 @@ body:
   - type: textarea
     id: steps-to-reproduce
     attributes:
-      label: Steps To Reproduce
+      label: Steps to reproduce
       description: Steps to reproduce the behavior.
       placeholder: |
         1. Make a player with a gun, magazine, and some ammo.
@@ -35,8 +35,7 @@ body:
       description: |
         A clear and concise description of what you expected to happen.
         Ideally also describe *why* you expect it to happen.
-      placeholder: |
-        I expected that aim level would increase, because all other skills can increase in level.
+      placeholder: I expected that aim level would increase, because all other skills can increase in level.
     validations:
       required: true
 
@@ -70,8 +69,7 @@ body:
     id: additional-context
     attributes:
       label: Additional context
-      description: |
-        Add any other context about the problem here.
+      description: Add any other context about the problem here.
       placeholder: |
         Crash: if your problem refers to a crash, please add the following files to the "Additional Context" paragraph:
           - From the /config folder (you can zip them both together):

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -0,0 +1,44 @@
+name: Feature Request ✨
+description: Suggest an idea or this project
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please take the time to fill out all the fields below.
+
+  - type: textarea
+    id: description-of-bug
+    attributes:
+      label: Is your feature request related to a problem? Please describe.
+      description: A clear and concise description of what the problem is that made you submit this report.
+      placeholder: I am always frustrated, when...
+    validations:
+      required: true
+
+  - type: textarea
+    id: description-of-solution
+    attributes:
+      label: Solution you would like.
+      description: A clear and concise description of what you want to happen.
+      placeholder: Instead of behaving like this, there should be...
+    validations:
+      required: true
+
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Describe alternatives you have considered.
+      description: A clear and concise description of any alternative solutions or features you have considered.
+      placeholder: Another workaround that would work, is...
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Add any other context (such as mock-ups, proof of concepts or screenshots) about the feature request here.
+    validations:
+      required: false
+

.github/workflows/astyle.yml

@@ -10,11 +10,16 @@ jobs:
     outputs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
     steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@master
-        with:
-          cancel_others: 'true'
-          paths: '[".github/workflows/astyle.yml", "Makefile", ".astylerc", "**.cpp", "**.h", "**.c"]'
+    - id: skip_check
+      uses: fkirc/skip-duplicate-actions@master
+      with:
+        cancel_others: 'true'
+        paths: '[".github/workflows/astyle.yml", "Makefile", ".astylerc", "**.cpp", "**.h", "**.c"]'
+    - run: echo ${{ github.event.number }} > pull_request_id
+    - uses: actions/upload-artifact@v2
+      with:
+        name: pull_request_id
+        path: pull_request_id
   astyle-code:
     name: astyle check
     needs: skip-duplicates

.github/workflows/json.yml

@@ -10,11 +10,16 @@ jobs:
     outputs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
     steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@master
-        with:
-          cancel_others: 'true'
-          paths: '["**.json"]'
+    - id: skip_check
+      uses: fkirc/skip-duplicate-actions@master
+      with:
+        cancel_others: 'true'
+        paths: '["**.json"]'
+    - run: echo ${{ github.event.number }} > pull_request_id
+    - uses: actions/upload-artifact@v2
+      with:
+        name: pull_request_id
+        path: pull_request_id
   style-json:
     name: JSON style check
 

.github/workflows/matrix.yml

@@ -58,57 +58,86 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-        release: [0]
-        cmake: [0]
-        tiles: [1]
-        sound: [0]
-        localize: [1]
-        native: [linux64]
-
         include:
+          - compiler: g++-9
+            os: ubuntu-latest
+            release: 1
+            cmake: 0
+            tiles: 0
+            sound: 0
+            localize: 1
+            test-stage: 1
+            gold: 1
+            lto: 1
+            native: linux64
+            title: Basic Build and Test (GCC 9, Curses, LTO)
+
           - compiler: clang++-12
             os: ubuntu-latest
+            release: 0
+            cmake: 0
+            tiles: 1
+            sound: 0
+            localize: 1
+            native: linux64
             sanitize: address
             mods: --mods=magiclysm
             title: Clang 12, Ubuntu, Tiles, ASan
 
           - compiler: g++-11
             os: ubuntu-latest
+            release: 0
+            cmake: 0
             tiles: 0
+            sound: 0
+            localize: 1
+            native: linux64
             sanitize: address
             title: GCC 11, Ubuntu, Curses, ASan
 
           - compiler: clang++
             os: macos-10.15
+            release: 0
+            cmake: 0
             native: osx
             sanitize: undefined
             tiles: 1
             sound: 1
+            localize: 1
             title: Clang 12, macOS 10.15, Tiles, Sound, UBSan
 
           - compiler: g++
             os: ubuntu-latest
+            release: 0
+            cmake: 0
             native:
             tiles: 1
             sound: 1
+            localize: 1
             test-stage: 1
             title: GCC 11, Ubuntu cross-compile to MinGW-Win64, Tiles, Sound
             ldflags: -static-libgcc -static-libstdc++
-            mxe_target: i686-w64-mingw32.static.gcc11
+            mxe_target: x86_64-w64-mingw32.static.gcc11
             wine: wine
 
           - compiler: clang++-6.0
             os: ubuntu-18.04
             tiles: 0
+            sound: 0
             release: 1
+            cmake: 0
+            localize: 1
+            native: linux64
             title: Clang 6, Ubuntu, Curses, Release
 
           - compiler: g++-7
             os: ubuntu-18.04
+            release: 0
             cmake: 1
             tiles: 1
             sound: 1
             localize: 0
+            native: linux64
             title: GCC 7, Ubuntu, Tiles, Sound, CMake
 
     name: ${{ matrix.title }}
@@ -192,6 +221,11 @@ jobs:
     - name: build and test
       if: ${{ env.SKIP == 'false' }}
       run: bash ./build-scripts/build.sh
+    - run: echo ${{ github.event.number }} > pull_request_id
+    - uses: actions/upload-artifact@v2
+      with:
+        name: pull_request_id
+        path: pull_request_id
     - name: upload artifacts if failed
       uses: actions/upload-artifact@v2
       if: failure()

.github/workflows/push-translation-template.yml

@@ -25,7 +25,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install gettext python3-pip
-          sudo pip3 install transifex-client
+          sudo pip3 install transifex-client polib
       - name: "Checkout"
         uses: actions/checkout@v2
       - name: "Generate translation template"

.github/workflows/release.yml

@@ -4,6 +4,20 @@ on:
   push:
     branches:
       - master
+    paths:
+      - '.github/workflows/release.yml'
+      - 'android/**'
+      - 'build-data/**'
+      - 'cataclysm-launcher'
+      - 'data/**'
+      - 'doc/**'
+      - 'gfx/**'
+      - 'lang/po/*.po'
+      - 'LICENSE*'
+      - 'Makefile'
+      - 'README*'
+      - 'src/**'
+
 jobs:
   release:
     name: Create Release