ci: fix a few issues

Totto16 · Totto16 · commit 0483517ddaf9 · 2024-10-01T19:08:43.000+02:00
add --no-install-recommends to all apt-get install calls
fix formatting of all files
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -4,7 +4,7 @@ on:
   release:
     types: [published]
   push:
-    branches: ["main"]
+    branches: ['main']
   pull_request:
   workflow_dispatch:
 
@@ -23,7 +23,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: "0"
+          fetch-depth: '0'
 
       # NOTE: meson has no dependencies, so --break-system-packages doesn't really break anything!
       - name: Setup Meson
@@ -32,30 +32,29 @@ jobs:
 
       - name: Setup ninja
         run: |
-            sudo apt-get update
-            sudo apt-get install ninja-build jq
+          sudo apt-get update
+          sudo apt-get install ninja-build jq -y --no-install-recommends
 
       - name: Setup JDK
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '21'
-        
+
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
-        
+
       - name: Setup NDK
-        run: | 
+        run: |
           sdkmanager --install "ndk;27.1.12297006"
 
-
       - name: Build native libraries
         run: |
           bash ./platforms/build-android.sh ${{ matrix.config.arch }} complete_rebuild release
           cp -r ./assets/ platforms/android/app/src/main
 
       - name: Build APK
-        run: | 
+        run: |
           cd platforms/android/
           ./gradlew assembleDebug --no-daemon -PANDROID_ABI=${{ matrix.config.arch }}
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,7 +2,7 @@ name: Build CI
 
 on:
   push:
-    branches: ["main"]
+    branches: ['main']
   pull_request:
   workflow_dispatch:
 
@@ -30,7 +30,7 @@ jobs:
             architecture: x86_64
             buildtype: release
             library_type: static
-            shell: "msys2 {0}"
+            shell: 'msys2 {0}'
 
           - name: Windows UCRT Release
             os: windows
@@ -39,7 +39,7 @@ jobs:
             architecture: ucrt-x86_64
             buildtype: release
             library_type: static
-            shell: "msys2 {0}"
+            shell: 'msys2 {0}'
 
           - name: Linux Release
             os: ubuntu
@@ -90,15 +90,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: "0"
+          fetch-depth: '0'
 
       - name: Setup MSVC (Windows)
         if: matrix.config.os == 'windows' && matrix.config.environment == 'msvc'
         uses: TheMrMilchmann/setup-msvc-dev@v3
         with:
           arch: x64
-          toolset: "14.41"
-
+          toolset: '14.41'
 
       - name: Setup MYSYS2 (Windows)
         if: matrix.config.os == 'windows' && ( matrix.config.environment == 'mingw' || matrix.config.environment == 'ucrt' )
@@ -126,7 +125,7 @@ jobs:
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           sudo ./llvm.sh 19
-          sudo apt-get install libc++-19* libc++abi*19* -y
+          sudo apt-get install libc++-19* libc++abi*19* -y --no-install-recommends
           echo "CC=clang-19" >> "$GITHUB_ENV"
           echo "CXX=clang++-19" >> "$GITHUB_ENV"
           echo "OBJC=clang-19" >> "$GITHUB_ENV"
@@ -143,7 +142,7 @@ jobs:
           # Also install the newest g++ (For the libstd++ library)
           echo "deb http://archive.ubuntu.com/ubuntu/ oracular main" | sudo tee -a /etc/apt/sources.list.d/new_ubuntu.list
           sudo apt-get update
-          sudo apt-get install libstdc++-14-dev -y
+          sudo apt-get install libstdc++-14-dev -y --no-install-recommends
           sudo rm -rf /etc/apt/sources.list.d/new_ubuntu.list
           sudo apt-get update
 
@@ -171,7 +170,7 @@ jobs:
           echo "OBJC_LD=lld" >> "$GITHUB_ENV"
 
       - name: Unbreak Python in GHA (MacOS 13 image)
-        if: matrix.config.os == 'macos'  &&  matrix.config.os-version == 13
+        if: matrix.config.os == 'macos' && matrix.config.os-version == 13
         run: |
           # TODO: remove this, after it works again
           # A workaround for "The `brew link` step did not complete successfully" error.
@@ -196,7 +195,7 @@ jobs:
         if: matrix.config.os == 'ubuntu'
         run: |
           sudo apt-get update
-          sudo apt-get install ninja-build libsdl2-2.0-0 libsdl2-dev libsdl2-ttf* libsdl2-mixer* libsdl2-image* -y
+          sudo apt-get install ninja-build libsdl2-2.0-0 libsdl2-dev libsdl2-ttf* libsdl2-mixer* libsdl2-image* -y --no-install-recommends
 
       - name: Install dependencies (MacOS)
         if: matrix.config.os == 'macos'
@@ -205,10 +204,10 @@ jobs:
           brew install sdl2 sdl2_ttf sdl2_mixer sdl2_image
 
       - name: Configure
-        run: meson setup build -Dbuildtype=${{ matrix.config.buildtype }} -Ddefault_library=${{ matrix.config.library_type }} -Dclang_libcpp=${{ ( ( matrix.config.os == 'ubuntu' && matrix.config.use-clang == true && matrix.config.use-clang_stdlib ) || matrix.config.os == 'macos' )  && 'enabled' || 'disabled' }} 
+        run: meson setup build -Dbuildtype=${{ matrix.config.buildtype }} -Ddefault_library=${{ matrix.config.library_type }} -Dclang_libcpp=${{ ( ( matrix.config.os == 'ubuntu' && matrix.config.use-clang == true && matrix.config.use-clang_stdlib ) || matrix.config.os == 'macos' ) && 'enabled' || 'disabled' }}
 
       - name: Build
-        run: meson compile -C build 
+        run: meson compile -C build
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/cpp-linter.yml b/.github/workflows/cpp-linter.yml
@@ -1,7 +1,7 @@
 name: C++ lints(clang-format + clang-tidy)
 on:
   push:
-    branches: ["main"]
+    branches: ['main']
   pull_request:
   workflow_dispatch:
 
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      # NOTE: meson has no dependencies, so --break-system-packages doesn't really break anything!  
+      # NOTE: meson has no dependencies, so --break-system-packages doesn't really break anything!
       - name: Setup Meson
         run: |
           pip install meson --break-system-packages
@@ -28,8 +28,8 @@ jobs:
       - name: Prepare compile_commands.json
         run: |
           sudo apt-get update
-          sudo apt-get install ninja-build libsdl2-2.0-0 libsdl2-dev libsdl2-ttf* libsdl2-mixer* libsdl2-image*  -y
-          
+          sudo apt-get install ninja-build libsdl2-2.0-0 libsdl2-dev libsdl2-ttf* libsdl2-mixer* libsdl2-image* -y --no-install-recommends
+
           meson setup build -Dbuildtype=release -Dclang_libcpp=disabled -Dtests=true
           meson compile -C build git_version.hpp
 
@@ -45,7 +45,7 @@ jobs:
           files-changed-only: ${{ github.event_name != 'workflow_dispatch' }}
           lines-changed-only: ${{ github.event_name != 'workflow_dispatch' }}
           thread-comments: true
-          tidy-checks: ""
+          tidy-checks: ''
           step-summary: true
           file-annotations: true
           ignore: subprojects|build|android|assets|recordings|docs|toolchains|platforms|wrapper|src/libs/core/hash-library
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
@@ -4,13 +4,13 @@ on:
   release:
     types: [published]
   push:
-    branches: ["main"]
+    branches: ['main']
   pull_request:
   workflow_dispatch:
 
 jobs:
   flatpak:
-    name: "Flatpak build"
+    name: 'Flatpak build'
     runs-on: ubuntu-24.04
     container:
       image: bilelmoussaoui/flatpak-github-actions:freedesktop-24.08
diff --git a/.github/workflows/installer.yml b/.github/workflows/installer.yml
@@ -2,7 +2,7 @@ name: Installer CI
 
 on:
   push:
-    branches: ["main"]
+    branches: ['main']
   pull_request:
   workflow_dispatch:
 
@@ -29,33 +29,33 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: "0"
+          fetch-depth: '0'
 
       - name: Setup MSVC (Windows)
         if: matrix.config.os == 'windows' && matrix.config.msvc == true
         uses: TheMrMilchmann/setup-msvc-dev@v3
         with:
           arch: x64
-          toolset: "14.41"
+          toolset: '14.41'
 
       - name: Setup meson
         if: matrix.config.os != 'macos'
         run: |
           pip install meson
 
       - name: Configure
-        run: meson setup build -Dbuildtype=${{ matrix.config.buildtype }} -Ddefault_library=${{ matrix.config.library_type }} -Dclang_libcpp=${{ ( ( matrix.config.os == 'ubuntu' && matrix.config.use-clang == true && matrix.config.use-clang_stdlib ) || matrix.config.os == 'macos' )  && 'enabled' || 'disabled' }} -Dbuild_installer=true
+        run: meson setup build -Dbuildtype=${{ matrix.config.buildtype }} -Ddefault_library=${{ matrix.config.library_type }} -Dclang_libcpp=${{ ( ( matrix.config.os == 'ubuntu' && matrix.config.use-clang == true && matrix.config.use-clang_stdlib ) || matrix.config.os == 'macos' ) && 'enabled' || 'disabled' }} -Dbuild_installer=true
 
       - name: Build
-        run: meson compile -C build 
+        run: meson compile -C build
 
       - name: Download EnVar plugin for NSIS
         uses: carlosperate/download-file-action@v2
         with:
           file-url: https://nsis.sourceforge.io/mediawiki/images/7/7f/EnVar_plugin.zip
           file-name: envar_plugin.zip
           location: ${{ github.workspace }}
-  
+
       - name: Extract EnVar plugin
         run: 7z x "-oC:/Program Files (x86)/NSIS" "${{ github.workspace }}/envar_plugin.zip"
 
diff --git a/.github/workflows/nintendo.yml b/.github/workflows/nintendo.yml
@@ -1,52 +1,52 @@
 name: Nintendo CI
 
 on:
-    push:
-        branches: ["main"]
-    pull_request:
-    workflow_dispatch:
+  push:
+    branches: ['main']
+  pull_request:
+  workflow_dispatch:
 
 jobs:
-    nintendo-build:
-        name: Nintendo ${{ matrix.config.name }} CI
-        runs-on: ubuntu-24.04
-        container:
-            image: devkitpro/${{ matrix.config.container }} ## base on debian:buster-slim
-        strategy:
-            fail-fast: false
-            matrix:
-                config:
-                    - name: 3ds
-                      extension: 3dsx
-                      container: devkitarm
-
-                    - name: switch
-                      extension: nro
-                      container: devkita64
-
-        steps:
-            - uses: actions/checkout@v4
-              with:
-                  fetch-depth: "0"
-
-            - name: Setup Meson
-              run: |
-                  sudo apt-get update
-                  sudo apt-get install python3 python3-pip -y
-                  python3 -m pip install --upgrade pip
-                  pip install meson
-
-            - name: Setup ninja
-              run: |
-                  sudo apt-get update
-                  sudo apt-get install ninja-build
-
-            - name: Configure and Build
-              run: |
-                  bash ./platforms/build-${{ matrix.config.name }}.sh complete_rebuild release
-
-            - name: Upload artifacts
-              uses: actions/upload-artifact@v4
-              with:
-                  name: ${{ matrix.config.name }} Executable
-                  path: build-${{ matrix.config.name }}/oopetris.${{ matrix.config.extension }}
+  nintendo-build:
+    name: Nintendo ${{ matrix.config.name }} CI
+    runs-on: ubuntu-24.04
+    container:
+      image: devkitpro/${{ matrix.config.container }} ## base on debian:buster-slim
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - name: 3ds
+            extension: 3dsx
+            container: devkitarm
+
+          - name: switch
+            extension: nro
+            container: devkita64
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: '0'
+
+      - name: Setup Meson
+        run: |
+          sudo apt-get update
+          sudo apt-get install python3 python3-pip -y --no-install-recommends
+          python3 -m pip install --upgrade pip
+          pip install meson
+
+      - name: Setup ninja
+        run: |
+          sudo apt-get update
+          sudo apt-get install ninja-build -y --no-install-recommends
+
+      - name: Configure and Build
+        run: |
+          bash ./platforms/build-${{ matrix.config.name }}.sh complete_rebuild release
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.config.name }} Executable
+          path: build-${{ matrix.config.name }}/oopetris.${{ matrix.config.extension }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
