ci: fix a few things

Totto16 · Totto16 · commit 801dd4983904 · 2024-10-01T20:10:57.000+02:00
format all build files
add --no-install-recommends to all apt-get install calls
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:
 
@@ -26,14 +26,14 @@ jobs:
             os-version: 2022
             environment: mingw
             architecture: x86_64
-            shell: "msys2 {0}"
+            shell: 'msys2 {0}'
 
           - name: Windows UCRT Release
             os: windows
             os-version: 2022
             environment: ucrt
             architecture: ucrt-x86_64
-            shell: "msys2 {0}"
+            shell: 'msys2 {0}'
 
           - name: Linux Release
             os: ubuntu
@@ -74,17 +74,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: "0"
+          fetch-depth: '0'
 
       - uses: actions/checkout@v4
-        name: Checkout OOPetris main repo  
+        name: Checkout OOPetris main repo
         with:
-          fetch-depth: "0"
+          fetch-depth: '0'
           repository: OpenBrickProtocolFoundation/oopetris
           ref: main
           path: ./oopetris
           submodules: false
-  
+
       - name: Setup MSVC (Windows)
         if: matrix.config.os == 'windows' && matrix.config.environment == 'msvc'
         uses: TheMrMilchmann/setup-msvc-dev@v3
@@ -107,26 +107,25 @@ jobs:
             mingw-w64-${{matrix.config.architecture}}-ca-certificates
             mingw-w64-${{matrix.config.architecture}}-cmake
             git
-  
+
       - name: Setup Clang (Linux)
         if: matrix.config.os == 'ubuntu' && matrix.config.use-clang == true
         run: |
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           sudo ./llvm.sh 18
-          sudo apt-get install libc++-18* libc++abi*18* -y
+          sudo apt-get install libc++-18* libc++abi*18* -y --no-install-recommends
           echo "CC=clang-18" >> "$GITHUB_ENV"
           echo "CXX=clang++-18" >> "$GITHUB_ENV"
           echo "OBJC=clang-18" >> "$GITHUB_ENV"
-    
-    
+
       - name: Setup GCC (Linux)
         if: matrix.config.os == 'ubuntu' && matrix.config.use-clang == false
         uses: egor-tensin/setup-gcc@v1
         with:
           version: 14
           platform: x64
-  
+
       - name: Setup Clang (MacOS)
         if: matrix.config.os == 'macos'
         run: |
@@ -143,11 +142,11 @@ jobs:
           echo "OBJC_LD=lld" >> "$GITHUB_ENV"
 
       - name: Setup meson (MacOS)
-        if: matrix.config.os == 'macos' 
+        if: matrix.config.os == 'macos'
         run: |
           brew update
           brew install meson
-  
+
       # NOTE: meson has no dependencies, so --break-system-packages doesn't really break anything!
       - name: Setup meson
         if: matrix.config.os != 'macos'
@@ -158,7 +157,7 @@ jobs:
         if: matrix.config.os == 'ubuntu'
         run: |
           sudo apt-get update
-          sudo apt-get install ninja-build libreadline-dev -y
+          sudo apt-get install ninja-build libreadline-dev -y --no-install-recommends
           sudo pip install meson --break-system-packages
 
       - name: Fix pkg-config (Windows MSVC)
@@ -169,23 +168,23 @@ jobs:
           echo "PKG_CONFIG_PATH=C:/lib/pkgconfig" | Out-File -FilePath $env:GITHUB_ENV -Append
 
       - name: Configure
-        run: | 
-            cd oopetris
-            meson setup build -Dbuildtype=release -Ddefault_library=static -Dclang_libcpp=${{ ( ( matrix.config.os == 'ubuntu' && matrix.config.use-clang == true && matrix.config.use-clang_stdlib ) || matrix.config.os == 'macos' )  && 'enabled' || 'disabled' }} -Donly_build_libs=true ${{ matrix.config.os == 'windows' && '-Db_vscrt=from_buildtype' || '' }}  ${{ (matrix.config.os == 'windows' && ( matrix.config.environment == 'mingw' || matrix.config.environment == 'ucrt' ))  && '-Dprefix=$RUNNER_TEMP/msys64${MINGW_PREFIX}/' || ''}}
+        run: |
+          cd oopetris
+          meson setup build -Dbuildtype=release -Ddefault_library=static -Dclang_libcpp=${{ ( ( matrix.config.os == 'ubuntu' && matrix.config.use-clang == true && matrix.config.use-clang_stdlib ) || matrix.config.os == 'macos' ) && 'enabled' || 'disabled' }} -Donly_build_libs=true ${{ matrix.config.os == 'windows' && '-Db_vscrt=from_buildtype' || '' }} ${{ (matrix.config.os == 'windows' && ( matrix.config.environment == 'mingw' || matrix.config.environment == 'ucrt' )) && '-Dprefix=$RUNNER_TEMP/msys64${MINGW_PREFIX}/' || ''}}
 
       - name: Build and install Libs
         if: matrix.config.os != 'ubuntu'
-        run: |  
-          cd oopetris 
-          meson install -C build 
+        run: |
+          cd oopetris
+          meson install -C build
 
       - name: Build and install Libs (Linux)
         if: matrix.config.os == 'ubuntu'
-        run: |  
-          cd oopetris 
-          sudo meson install -C build 
+        run: |
+          cd oopetris
+          sudo meson install -C build
 
       - name: Build Wrapper
-        run: | 
-          meson setup -Dtests=false -Dexample=true build -Dbuildtype=release -Ddefault_library=static -Dclang_libcpp=${{ ( ( matrix.config.os == 'ubuntu' && matrix.config.use-clang == true && matrix.config.use-clang_stdlib ) || matrix.config.os == 'macos' )  && 'enabled' || 'disabled' }} ${{ matrix.config.os == 'windows' && '-Db_vscrt=from_buildtype' || '' }}
+        run: |
+          meson setup -Dtests=false -Dexample=true build -Dbuildtype=release -Ddefault_library=static -Dclang_libcpp=${{ ( ( matrix.config.os == 'ubuntu' && matrix.config.use-clang == true && matrix.config.use-clang_stdlib ) || matrix.config.os == 'macos' ) && 'enabled' || 'disabled' }} ${{ matrix.config.os == 'windows' && '-Db_vscrt=from_buildtype' || '' }}
           meson compile -C build
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,23 +2,23 @@ name: Test CI
 
 on:
   push:
-    branches: ["main"]
+    branches: ['main']
   pull_request:
   workflow_dispatch:
 
 jobs:
   test:
-    name: Run Tests 
+    name: Run Tests
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: "0"
+          fetch-depth: '0'
 
       - uses: actions/checkout@v4
         name: Checkout OOPetris main repo
         with:
-          fetch-depth: "0"
+          fetch-depth: '0'
           repository: OpenBrickProtocolFoundation/oopetris
           ref: main
           path: ./oopetris
@@ -29,10 +29,10 @@ jobs:
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           sudo ./llvm.sh 18
-          sudo apt-get install libc++-18* libc++abi*18* llvm-18 -y
+          sudo apt-get install libc++-18* libc++abi*18* llvm-18 -y --no-install-recommends
           echo "CC=clang-18" >> "$GITHUB_ENV"
           echo "CXX=clang++-18" >> "$GITHUB_ENV"
-              
+
         # NOTE: meson has no dependencies, so --break-system-packages doesn't really break anything!
       - name: Setup meson
         run: |
@@ -41,20 +41,20 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install ninja-build valgrind gcovr libcriterion-dev libreadline-dev -y
+          sudo apt-get install ninja-build valgrind gcovr libcriterion-dev libreadline-dev -y --no-install-recommends
 
       - name: Configure
-        run: | 
-            cd oopetris
-            meson setup build -Db_coverage=true -Dbuildtype=debugoptimized -Ddefault_library=shared -Dclang_libcpp=enabled -Donly_build_libs=true -Dprefix=/usr
+        run: |
+          cd oopetris
+          meson setup build -Db_coverage=true -Dbuildtype=debugoptimized -Ddefault_library=shared -Dclang_libcpp=enabled -Donly_build_libs=true -Dprefix=/usr
 
       - name: Build and install Libs
         run: |
-          cd oopetris 
-          sudo meson install -C build 
+          cd oopetris
+          sudo meson install -C build
 
       - name: Build Wrapper
-        run: | 
+        run: |
           meson setup build -Db_coverage=true -Dbuildtype=debugoptimized -Ddefault_library=shared -Dclang_libcpp=enabled -Dtests=true -Dexample=true -Dprefix=/usr
           meson compile -C build
 
@@ -70,20 +70,19 @@ jobs:
           path: ./build/meson-logs/coverage.xml
           fail: true
           publish: true
-          coverage-summary-title: "Code Coverage Summary"
+          coverage-summary-title: 'Code Coverage Summary'
           togglable-report: true
 
       - name: Upload test coverage artifacts
         uses: actions/upload-artifact@v4
         with:
-            name: Tests coverage artifacts
-            path: |
-              ./build/meson-logs/coverage.xml
-              ./build/meson-logs/coveragereport/
-
+          name: Tests coverage artifacts
+          path: |
+            ./build/meson-logs/coverage.xml
+            ./build/meson-logs/coveragereport/
 
       - name: Test for leaks with valgrind (Linux)
-        run: | 
-            valgrind --tool=memcheck --leak-check=full --error-exitcode=1 ./build/example/example r ./tests/files/correct.rec
-            valgrind --tool=memcheck --leak-check=full --error-exitcode=1 cat ./tests/files/example.rec_text | ./build/example/example w ./test.rec
-            valgrind --tool=memcheck --leak-check=full --error-exitcode=1 ./build/example/example r ./test.rec
+        run: |
+          valgrind --tool=memcheck --leak-check=full --error-exitcode=1 ./build/example/example r ./tests/files/correct.rec
+          valgrind --tool=memcheck --leak-check=full --error-exitcode=1 cat ./tests/files/example.rec_text | ./build/example/example w ./test.rec
+          valgrind --tool=memcheck --leak-check=full --error-exitcode=1 ./build/example/example r ./test.rec
