From 655b5d72862f4ed25b54e77a50fc6c42298ec327 Mon Sep 17 00:00:00 2001
From: Bruno Van de Velde <vdv_b@tgui.eu>
Date: Tue, 23 Jan 2024 22:45:24 +0100
Subject: [PATCH] Re-enable ios-sfml-graphics CI job, using the latest SFML 2
 version

---
 .github/workflows/ci.yml | 85 ++++++++++++++++++++--------------------
 1 file changed, 42 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 32ac40bda..ae2ee0e54 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -812,47 +812,47 @@ jobs:
 
   #----------------------------------------
 
-  #ios-sfml-graphics:
-  #  runs-on: macos-12
-  #  env:
-  #    SFML_VERSION: 2.5.1
-  #  steps:
-  #    - name: Checkout TGUI
-  #      uses: actions/checkout@v3
-  #
-  #    - name: Cache SFML
-  #      uses: actions/cache@v3
-  #      id: cache-sfml
-  #      with:
-  #        path: SFML_INSTALL
-  #        key: CACHE_IOS_SFML_${{env.SFML_VERSION}}
-  #
-  #    - name: Build SFML
-  #      if: steps.cache-sfml.outputs.cache-hit != 'true'
-  #      run: |
-  #        wget -nv https://github.com/SFML/SFML/releases/download/$SFML_VERSION/SFML-$SFML_VERSION-sources.zip
-  #        unzip SFML-$SFML_VERSION-sources.zip
-  #        cmake -GXcode -DCMAKE_INSTALL_PREFIX=SFML_INSTALL -DCMAKE_TOOLCHAIN_FILE="$GITHUB_WORKSPACE/SFML-$SFML_VERSION/cmake/toolchains/iOS.toolchain.cmake" -DIOS_PLATFORM=OS -DBUILD_SHARED_LIBS=OFF -DSFML_BUILD_AUDIO=OFF -DSFML_BUILD_NETWORK=OFF -S SFML-$SFML_VERSION -B SFML-build
-  #        cmake --build SFML-build --config Debug --target install
-  #
-  #    - name: Build TGUI
-  #      run: >
-  #        cmake -B TGUI-build
-  #        -GXcode
-  #        -DCMAKE_SYSTEM_NAME=iOS
-  #        -DCMAKE_OSX_ARCHITECTURES=arm64
-  #        -DCMAKE_OSX_DEPLOYMENT_TARGET=14.4
-  #        -DCMAKE_INSTALL_PREFIX=TGUI_INSTALL
-  #        -DSFML_DIR="$GITHUB_WORKSPACE/SFML_INSTALL/lib/cmake/SFML/"
-  #        -DCMAKE_UNITY_BUILD=ON
-  #        -DBUILD_SHARED_LIBS=OFF
-  #        -DTGUI_CXX_STANDARD=20
-  #        -DTGUI_WARNINGS_AS_ERRORS=ON
-  #        -DTGUI_BUILD_EXAMPLES=OFF
-  #        -DTGUI_BACKEND=SFML_GRAPHICS
-  #        -DFreeType_LIB="$GITHUB_WORKSPACE/SFML-$SFML_VERSION/extlibs/libs-ios/libfreetype.a"
-  #
-  #        cmake --build TGUI-build --config Debug --target install
+  ios-sfml-graphics:
+    runs-on: macos-12
+    env:
+      SFML_VERSION: 2.6.x  # At least 2.6.2 is required
+    steps:
+      - name: Checkout TGUI
+        uses: actions/checkout@v3
+
+      - name: Cache SFML
+        uses: actions/cache@v3
+        id: cache-sfml
+        with:
+          path: SFML_INSTALL
+          key: CACHE_IOS_SFML_${{env.SFML_VERSION}}
+
+      - name: Build SFML
+        if: steps.cache-sfml.outputs.cache-hit != 'true'
+        run: |
+          wget -nv https://github.com/SFML/SFML/archive/refs/heads/${SFML_VERSION}.zip
+          unzip ${SFML_VERSION}.zip
+          cmake -GXcode -DCMAKE_INSTALL_PREFIX=SFML_INSTALL -DCMAKE_TOOLCHAIN_FILE="$GITHUB_WORKSPACE/SFML-$SFML_VERSION/cmake/toolchains/iOS.toolchain.cmake" -DIOS_PLATFORM=OS -DBUILD_SHARED_LIBS=OFF -DSFML_BUILD_AUDIO=OFF -DSFML_BUILD_NETWORK=OFF -S SFML-$SFML_VERSION -B SFML-build
+          cmake --build SFML-build --config Debug --target install
+
+      - name: Build TGUI
+        run: >
+          cmake -B TGUI-build
+          -GXcode
+          -DCMAKE_SYSTEM_NAME=iOS
+          -DCMAKE_OSX_ARCHITECTURES=arm64
+          -DCMAKE_OSX_DEPLOYMENT_TARGET=14.4
+          -DCMAKE_INSTALL_PREFIX=TGUI_INSTALL
+          -DSFML_DIR="$GITHUB_WORKSPACE/SFML_INSTALL/lib/cmake/SFML/"
+          -DCMAKE_UNITY_BUILD=ON
+          -DBUILD_SHARED_LIBS=OFF
+          -DTGUI_CXX_STANDARD=20
+          -DTGUI_WARNINGS_AS_ERRORS=ON
+          -DTGUI_BUILD_EXAMPLES=OFF
+          -DTGUI_BACKEND=SFML_GRAPHICS
+          -DFreeType_LIB="$GITHUB_WORKSPACE/SFML-$SFML_VERSION/extlibs/libs-ios/libfreetype.a"
+
+          cmake --build TGUI-build --config Debug --target install
 
   #----------------------------------------
 
@@ -944,8 +944,7 @@ jobs:
   #       I've decided to just put the nightly build code in this file as well.
   nightly-build-windows-visual-studio:
     if: github.event_name == 'push' && github.ref == 'refs/heads/1.x'
-    #needs: [linux, linux-latest-dev, linux-oldest, linux-per-backend, windows-sfml-sdl, windows-oldest, windows-clang, windows-static-mt, macos, android-sdl, android-sfml-graphics, ios-sfml-graphics, ios-sdl]
-    needs: [linux, linux-latest-dev, linux-oldest, linux-per-backend, windows-sfml-sdl, windows-oldest, windows-clang, windows-static-mt, macos, android-sdl, android-sfml-graphics, ios-sdl]
+    needs: [linux, linux-latest-dev, linux-oldest, linux-per-backend, windows-sfml-sdl, windows-oldest, windows-clang, windows-static-mt, macos, android-sdl, android-sfml-graphics, ios-sfml-graphics, ios-sdl]
     runs-on: windows-2019
     env:
       SFML_VERSION: 2.6.1