Merge branch 'master' into switch

# Conflicts:
#	README.md

.github/workflows/scan-build.yml → .github/workflows/clang_analyzer.yml

@@ -1,24 +1,23 @@
-name: scan-build analyzer
+name: Clang Analyzer
 
 on:
-  push:
-    branches: [ master ]
   pull_request:
     branches: [ master ]
 
 jobs:
-  scan-build:
+  clang:
+    name: Clang Analyzer
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 50
-    - name: install SDL 2 and clang-tools
+    - name: Install dependencies and clang-tools
       run: |
         sudo apt-get update
         sudo apt-get install -y libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev gettext clang-tools
-    - name: compile
+    - name: Analyze
       run: scan-build --status-bugs -v make -j 2
       env:
-        FHEROES2_STRICT_COMPILATION: "ON"
-        WITH_TOOLS: "ON"
+        FHEROES2_STRICT_COMPILATION: ON
+        WITH_TOOLS: ON

.github/workflows/cmake.yml

@@ -0,0 +1,49 @@
+name: CMake
+
+on:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+        - name: Linux SDL1
+          os: ubuntu-latest
+          sdl_version: SDL
+          dependencies: libsdl1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev
+        - name: Linux SDL2
+          os: ubuntu-latest
+          sdl_version: SDL2
+          dependencies: libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev
+        - name: macOS SDL1
+          os: macos-latest
+          sdl_version: SDL
+          dependencies: sdl sdl_image sdl_mixer sdl_ttf
+        - name: macOS SDL2
+          os: macos-latest
+          sdl_version: SDL2
+          dependencies: sdl2 sdl2_image sdl2_mixer sdl2_ttf
+    name: CMake (${{ matrix.config.name }})
+    runs-on: ${{ matrix.config.os }}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Install dependencies (Linux)
+      if: ${{ matrix.config.os == 'ubuntu-latest' }}
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y ${{ matrix.config.dependencies }}
+    - name: Install dependencies (macOS)
+      if: ${{ matrix.config.os == 'macos-latest' }}
+      run: |
+        brew install ${{ matrix.config.dependencies }}
+    - name: Build
+      run: |
+        cmake -B build -DCMAKE_BUILD_TYPE=Release -DUSE_SDL_VERSION=${{ matrix.config.sdl_version }} -DENABLE_IMAGE=ON -DENABLE_UNICODE=ON -DENABLE_TOOLS=ON -DFHEROES2_STRICT_COMPILATION=ON
+        cmake --build build -j2
+    - name: Install
+      run: |
+        sudo cmake --install build

.github/workflows/clang_format.yml → .github/workflows/code_style_check.yml

@@ -1,13 +1,16 @@
 name: Code style check
 
-on: [pull_request]
+on:
+  pull_request:
+    branches: [ master ]
 
 jobs:
-  clang-format:
+  check:
+    name: Code style check
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 50
-    - name: run clang-format-diff
+    - name: Run clang-format-diff
       run: bash ./script/tools/check_code_format.sh