SuperTux
diff --git a/‎.ci_scripts/package.sh‎
Lines changed: 1 addition & 1 deletion b/‎.ci_scripts/package.sh‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/gnulinux.yml‎
Lines changed: 86 additions & 65 deletions b/‎.github/workflows/gnulinux.yml‎
Lines changed: 86 additions & 65 deletions
diff --git a/‎.github/workflows/macos.yml‎
Lines changed: 31 additions & 22 deletions b/‎.github/workflows/macos.yml‎
Lines changed: 31 additions & 22 deletions
@@ -21,7 +21,7 @@ if [ "$SOURCE" = "ON" ]; then
     cpack --config CPackSourceConfig.cmake -G TGZ;
 fi
 
-if ([ "$OS_NAME" = "ubuntu-22.04" ] || [ "$OS_NAME" = "ubuntu-20.04" ] || [ "$OS_NAME" = "ubuntu-18.04" ]) && [ "$PACKAGE" = "ON" ]; then
+if ([ "$OS_NAME" = "ubuntu-latest" ]) && [ "$PACKAGE" = "ON" ]; then
     ../.ci_scripts/build_appimage.sh
     # extract built appimages for uploading
     mv ~/out/* .
 
@@ -27,34 +27,24 @@ on:
 
 jobs:
   gnulinux:
-
     strategy:
       fail-fast: false
       matrix:
+        # TODO Working Linux 32-bit packaging
+        # TODO CTest & coverage workflow implement
         arch: [32, 64]
-        os: [ubuntu-22.04]
+        os: [ubuntu-latest]
         compiler: [gcc, clang]
         build_type: [Debug, Release]
-        glbinding: [ON, OFF]
-        exclude:
-          - arch: 32
-            glbinding: ON
         include:
-          - os: ubuntu-22.04
+          - os: ubuntu-latest
             build_type: Release
             compiler: gcc
             arch: 64
-            glbinding: OFF
             release: ON
             source: ON
-            documentation: ON
-          - os: ubuntu-22.04
-            build_type: Debug
-            compiler: gcc
-            arch: 64
-            glbinding: OFF
+            documentation: true
             coverage: ON
-            # TODO: Working Linux 32-bit packaging
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -70,69 +60,77 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y \
             cmake \
+            ninja-build \
             build-essential \
             automake \
             gtk-doc-tools \
+            fuse \
             rpm \
             rename \
             sshpass \
-            clang-14 \
-            g++-9 \
-            gcc-multilib \
-            g++-multilib \
+            clang \
+            g++ \
+            libglu1-mesa-dev \
             libgtest-dev \
             libc++-dev \
             libogg-dev \
             libvorbis-dev \
             libopenal-dev \
             libsdl2-dev \
             libsdl2-image-dev \
-            libfreetype6-dev \
-            libharfbuzz-dev \
-            libfribidi-dev \
             libglib2.0-dev \
+            libfreetype6-dev \
             libraqm-dev \
             libglew-dev \
             libglbinding-dev \
             libcurl4-openssl-dev \
             libglm-dev \
+            libfmt-dev \
+            libphysfs-dev \
             zlib1g-dev \
             lcov \
-            doxygen \
-            libfuse2
+            doxygen
 
       - name: Install 32-bit dependencies
         if: ${{ matrix.arch == 32 }}
         run: |
           sudo dpkg --add-architecture i386
           sudo apt-get update
+
           sudo apt-get install -y \
             cmake \
+            ninja-build \
             build-essential \
             automake \
             gtk-doc-tools \
+            fuse \
             rpm \
             rename \
             sshpass \
+            clang \
             gcc-multilib \
             g++-multilib \
-            libgtest-dev:i386 \
+            libglu1-mesa-dev:i386 \
             libogg-dev:i386 \
             libvorbis-dev:i386 \
             libopenal-dev:i386 \
             libsdl2-dev:i386 \
             libsdl2-image-dev:i386 \
             libfreetype6-dev:i386 \
             libcurl4-openssl-dev:i386 \
-            libharfbuzz-dev:i386 \
-            libfribidi-dev:i386 \
-            libglm-dev \
-            zlib1g-dev \
-            libfuse2
+            zlib1g-dev:i386 \
+            libfmt-dev:i386 \
+            libglm-dev
+
+          # Let's get out of this directory to disable vcpkg manifest mode.
+          # Manifest mode is not adequate here because most dependencies can
+          # be used via the system package manager.
+          pushd /
 
-          # Nethier GLEW nor glbinding exist in 32-bit for Ubuntu 22.04, so snatch the debs from 16.04 instead
-          wget archive.ubuntu.com/ubuntu/pool/main/g/glew/libglew1.13_1.13.0-2_i386.deb && sudo dpkg -i libglew1.13_1.13.0-2_i386.deb
-          wget archive.ubuntu.com/ubuntu/pool/main/g/glew/libglew-dev_1.13.0-2_i386.deb && sudo dpkg -i libglew-dev_1.13.0-2_i386.deb
+          # These libraries don't exist for 32-bit in Ubuntu repositories.
+          vcpkg install --triplet x86-linux physfs glew libraqm
+
+          popd
 
       - name: Set compiler (gcc)
         if: ${{ matrix.compiler == 'gcc' }}
@@ -146,51 +144,74 @@ jobs:
           echo "CXX=clang++" >> $GITHUB_ENV
           echo "CC=clang" >> $GITHUB_ENV
 
+      - name: Run slugify
+        id: slugify
+        uses: eltimn/[email protected]
+
       - name: Configure build
+        shell: pwsh
         env:
+          # Using git rev-parse gives incorrect values when querying the branch
+          # so, use slugify instead
+          GIT_HASH: ${{ steps.slugify.outputs.sha }}
+          GIT_BRANCH: ${{ steps.slugify.outputs.branch }}
           BUILD_TYPE: ${{ matrix.build_type }}
-          ARCH: ${{ matrix.arch == 32 && '-DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32' || '' }}
+          32BIT: ${{ matrix.arch == 32 }}
           MAKE_DOCS: ${{ matrix.documentation }}
           GLBINDING: ${{ matrix.glbinding }}
-          # FIXME: GoogleTest isn't detected by CMake on Ubuntu 18.04
-          # (also check the step that invokes the tests with ./test_supertux2)
-          TESTS: ${{ matrix.os == 'ubuntu-22.04' }}
-          CMAKE_POLICY_VERSION_MINIMUM: 3.5
+          #TESTS: ${{ matrix.os == 'ubuntu-20.04' }}
         run: |
-          cmake --version
-          $CXX --version
+          $Env:GIT_TAG = (& git describe --tags --abbrev=0)
+
+          echo "Git information:"
+          echo "- GIT_TAG: $Env:GIT_TAG"
+          echo "- GIT_HASH: $Env:GIT_HASH"
+          echo "- GIT_BRANCH: $Env:GIT_BRANCH"
+
+          & cmake --version
+          & $Env:CXX --version
+
           mkdir "build"
           cd "build"
-          cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE $ARCH -DBUILD_TESTS=$TESTS   \
-                   -DWARNINGS=ON -DWERROR=ON -DGLBINDING_ENABLED=$GLBINDING    \
-                   -DCMAKE_INSTALL_MESSAGE=NEVER -DCMAKE_INSTALL_PREFIX=/usr   \
-                   -DBUILD_DOCUMENTATION=$MAKE_DOCS -DINSTALL_SUBDIR_BIN=bin   \
-                   -DINSTALL_SUBDIR_SHARE=share/supertux2 -DENABLE_DISCORD=ON.
+
+          # Pass -DPhysFS_PREFER_FIND_PACKAGE=ON because we use
+          # vcpkg for physfs on 32bit
+          & cmake .. -DCMAKE_BUILD_TYPE="$Env:BUILD_TYPE" -DENABLE_DISCORD=ON `
+                     -DCMAKE_INSTALL_MESSAGE=NEVER -DCMAKE_INSTALL_PREFIX=/usr `
+                     -DCMAKE_POLICY_VERSION_MINIMUM="3.5" `
+                     -DSUPERTUX_PACKAGE_VERSION="$Env:GIT_TAG dev - $Env:GIT_HASH ($Env:GIT_BRANCH) (CI ARTIFACT)" `
+                     -DSUPERTUX_VERSION_STRING="$Env:GIT_BRANCH-$Env:GIT_HASH" `
+                     $(if ($Env:32BIT -eq "true") {
+                       "-DCMAKE_TOOLCHAIN_FILE=$Env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake "
+                       "-DVCPKG_TARGET_TRIPLET=x86-linux "
+                       "-DVCPKG_MANIFEST_MODE=OFF "
+                       "-DPhysFS_PREFER_FIND_PACKAGE=ON"
+                     }) `
+                     -DBUILD_DOCUMENTATION="$(if ($Env:MAKE_DOCS -eq "true") {"ON"} else {"OFF"})" `
+                     -DCMAKE_CXX_FLAGS="$(if ($Env:32BIT -eq "true") {"-m32"})" `
+                     -DCMAKE_C_FLAGS="$(if ($Env:32BIT -eq "true") {"-m32"})" `
+                     -DBUILD_TESTING=OFF
 
       - name: Build and install
         working-directory: build
-        env:
-          CMAKE_POLICY_VERSION_MINIMUM: 3.5
         run: |
           make -j3 VERBOSE=1
           make install DESTDIR="/tmp/supertux" VERBOSE=1
 
-      - name: Run tests
-        # FIXME: GoogleTest isn't detected by CMake on Ubuntu 18.04
-        # (also check the step that invokes CMake with -DBUILD_TESTS)
-        if: ${{ matrix.os == 'ubuntu-22.04' }}
-        working-directory: build
-        run: ./test_supertux2
+      # - name: Run tests
+      #   if: ${{ matrix.os == 'ubuntu-20.04' }}
+      #   working-directory: build
+      #   run: ./test_supertux2
 
-      - name: Make coverage
-        if: ${{ matrix.coverage }}
-        working-directory: build
-        run: |
-          lcov --capture --directory . --exclude '/usr/*' --exclude '*/tests/*'\
-               --exclude '*/external/*' --output-file coverage.info
-          mkdir coverage
-          cd coverage
-          genhtml ../coverage.info
+      # - name: Make coverage
+      #   if: ${{ matrix.coverage }}
+      #   working-directory: build
+      #   run: |
+      #     lcov --capture --directory . --exclude '/usr/*' --exclude '*/tests/*'\
+      #          --exclude '*/external/*' --output-file coverage.info
+      #     mkdir coverage
+      #     cd coverage
+      #     genhtml ../coverage.info
 
       - name: Make documentation
         if: ${{ matrix.documentation }}
@@ -199,7 +220,7 @@ jobs:
           doxygen docs/Doxyfile
 
       - name: Package
-        if: matrix.arch != '32'
+        if: matrix.arch != '32' && matrix.build_type != 'Debug'
         env:
           OS_NAME: ${{ matrix.os }}
           ARCH: ${{ matrix.arch }} # TODO: Working Linux 32-bit packaging
@@ -211,10 +232,10 @@ jobs:
         run: ../.ci_scripts/package.sh
 
       - name: Upload AppImage
-        if: matrix.build_type != 'Debug' && matrix.glbinding == 'OFF'
+        if: matrix.build_type != 'Debug'
         uses: actions/upload-artifact@v4
         with:
-          name: "${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.compiler }}-${{ matrix.build_type }}${{ matrix.glbinding == 'ON' && '-glbinding' || '' }}-appimage"
+          name: "${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.compiler }}-${{ steps.slugify.outputs.branch }}-${{ steps.slugify.outputs.sha }}-${{ matrix.build_type }}-appimage"
           path: build/upload/*.AppImage
           if-no-files-found: ignore
 
 
@@ -33,11 +33,9 @@ jobs:
       matrix:
         os: [macos-13]
         build_type: [Debug, Release]
-        glbinding: [ON, OFF]
         include:
           - os: macos-13
             build_type: Release
-            glbinding: OFF
             release: ON
 
     runs-on: ${{ matrix.os }}
@@ -53,10 +51,9 @@ jobs:
         run: |
           # Use GLM 1.0.0 as later versions don't build with clang
           HOMEBREW_NO_AUTO_UPDATE=1 brew install --formula ./mk/brew/glm.rb --build-from-source
-          brew install cmake googletest bash rename libogg libvorbis glew \
-                       openal-soft sdl2 sdl2_image sdl2_ttf freetype harfbuzz \
-                       fribidi glib gtk-doc glbinding@2 libraqm zlib
-          brew link glbinding@2
+          brew install cmake bash rename libogg libvorbis glew \
+                       openal-soft sdl2 sdl2_image libraqm freetype \
+                       glib gtk-doc zlib physfs fmt
 
           install_name_tool -change \
             '@rpath/libsharpyuv.0.dylib' \
@@ -80,37 +77,49 @@ jobs:
           echo "CXX=clang++" >> $GITHUB_ENV
           echo "CC=clang" >> $GITHUB_ENV
 
+      - name: Run slugify
+        id: slugify
+        uses: eltimn/[email protected]
+
       - name: Configure build
         env:
+          # Using git rev-parse gives incorrect values when querying the branch
+          # so, use slugify instead
+          GIT_HASH: ${{ steps.slugify.outputs.sha }}
+          GIT_BRANCH: ${{ steps.slugify.outputs.branch }}
           BUILD_TYPE: ${{ matrix.build_type }}
-          GLBINDING: ${{ matrix.glbinding }}
-          CMAKE_POLICY_VERSION_MINIMUM: 3.5
+          PKG_CONFIG_PATH: /usr/local/opt/openal-soft/lib/pkgconfig:/usr/local/opt/zlib/lib/pkgconfig
         run: |
+          GIT_TAG="$(git describe --tags --abbrev=0)"
+
+          echo "Git information:"
+          echo "- GIT_TAG: $GIT_TAG"
+          echo "- GIT_HASH: $GIT_HASH"
+          echo "- GIT_BRANCH: $GIT_BRANCH"
+
           cmake --version
           $CXX --version
+
           mkdir "build"
           cd "build"
-          # TODO add -DGLBINDING_ENABLED=$USE_GLBINDING
-          # NOTE: The `WERROR` flag is set to OFF in order to work around issues
-          #       where said flag applied to system includes as well, causing the
-          #       builds to fail. This issue requires further investigation!
-          cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE $ARCH -DBUILD_TESTS=ON       \
-                   -DWARNINGS=ON -DWERROR=OFF -DGLBINDING_ENABLED=$GLBINDING    \
+
+          cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE $ARCH                        \
                    -DENABLE_DISCORD=ON -DCMAKE_INSTALL_MESSAGE=NEVER           \
+                   -DSUPERTUX_PACKAGE_VERSION="$GIT_TAG dev - $GIT_HASH ($GIT_BRANCH) (CI ARTIFACT)" \
+                   -DSUPERTUX_VERSION_STRING="$GIT_BRANCH-$GIT_HASH"           \
                    -DCMAKE_INSTALL_PREFIX=/usr -DINSTALL_SUBDIR_BIN=bin        \
-                   -DINSTALL_SUBDIR_SHARE=share/supertux2
+                   -DINSTALL_SUBDIR_SHARE=share/supertux2                      \
+                   -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
       - name: Build and install
-        env:
-          CMAKE_POLICY_VERSION_MINIMUM: 3.5
         working-directory: build
         run: |
           make -j3 VERBOSE=1
           make install DESTDIR="/tmp/supertux" VERBOSE=1
 
-      - name: Run tests
-        working-directory: build
-        run: ./test_supertux2
+      #- name: Run tests
+      #  working-directory: build
+      #  run: ./test_supertux2
 
       - name: Package
         env:
@@ -123,9 +132,9 @@ jobs:
         run: ../.ci_scripts/package.sh
 
       - uses: actions/upload-artifact@v4
-        if: matrix.build_type != 'Debug' && matrix.glbinding == 'OFF'
+        if: matrix.build_type != 'Debug'
         with:
-          name: "${{ matrix.os }}-${{ matrix.build_type }}${{ matrix.glbinding == 'ON' && '-glbinding' || '' }}-dmg"
+          name: "${{ matrix.os }}-${{ matrix.build_type }}-${{ steps.slugify.outputs.branch }}-${{ steps.slugify.outputs.sha }}-dmg"
           path: build/upload/*.dmg
           if-no-files-found: ignore