Test SDK 18

o01eg · Dec 24, 2024 · 612e1b9 · 612e1b9
1 parent 2fdfd33
commit 612e1b9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/_build-android.yml b/.github/workflows/_build-android.yml
@@ -42,7 +42,7 @@ jobs:
         id: download-sdk
         uses: suisei-cn/actions-download-file@v1.4.0
         with:
-          url: https://github.com/o01eg/freeorion-sdk/releases/download/v17/FreeOrionSDK_17_Android-${{ matrix.arch }}.zip
+          url: https://github.com/o01eg/freeorion-sdk/releases/download/v18/FreeOrionSDK_18_Android-${{ matrix.arch }}.zip
           target: ../
       - uses: nttld/setup-ndk@v1
         id: setup-ndk

diff --git a/.github/workflows/_build-macos.yml b/.github/workflows/_build-macos.yml
@@ -67,15 +67,14 @@ jobs:
           cmake --build . --config Release -- -parallelizeTargets
       - name: Test
         # Tests don't find dynamic libraries in build/Release on Macos 12
-        if: inputs.os == 'macos-13'
+        if: ${{ inputs.os == 'macos-13' || inputs.os == 'macos-14' }}
         run: |
           cd build
           export PATH="$(pwd)/Release:/usr/local/opt/ccache/libexec:$PATH"
           export DYLD_FALLBACK_LIBRARY_PATH="$(pwd)/dep/lib:$(pwd)/Release"
           export DYLD_LIBRARY_PATH="$(pwd)/dep/lib:$(pwd)/Release:$DYLD_LIBRARY_PATH"
           cmake --build . --config Release --target unittest --verbose
       - name: Generate binaries
-        if: ${{ inputs.weekly-deploy }}
         run: |
           export PATH="/usr/local/opt/ccache/libexec:$PATH"
           alias cmake="/usr/local/bin/gtimeout 40m /usr/local/bin/cmake"
@@ -86,3 +85,11 @@ jobs:
       - name: Upload binaries only
         if: ${{ inputs.weekly-deploy }}
         run: bash -c 'scp -vv -o ServerAliveCountMax=2 -o ServerAliveInterval=300 -o ConnectTimeout=120 -o ConnectionAttempts=5 build/FreeOrion_*_Test_MacOSX_*.dmg o01eg@frs.sourceforge.net:/home/frs/project/freeorion/FreeOrion/Test/'
+      - name: Upload artifacts
+        if: ${{ inputs.os == 'macos-13' && !inputs.weekly-deploy }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: macos-package
+          path: build/FreeOrion_*_Test_MacOSX_*.dmg
+          if-no-files-found: error
+          retention-days: 1
diff --git a/.github/workflows/_build-windows-msvs.yml b/.github/workflows/_build-windows-msvs.yml
@@ -23,7 +23,7 @@ jobs:
         id: download-sdk
         uses: suisei-cn/actions-download-file@v1.4.0
         with:
-          url: https://github.com/o01eg/freeorion-sdk/releases/download/v17/FreeOrionSDK_17_MSVC-v143-Win32.zip
+          url: https://github.com/o01eg/freeorion-sdk/releases/download/v18/FreeOrionSDK_18_MSVC-v143-Win32.zip
           target: ../
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v1.3.1

diff --git a/.github/workflows/_build-windows.yml b/.github/workflows/_build-windows.yml
@@ -23,7 +23,7 @@ jobs:
         id: download-sdk
         uses: suisei-cn/actions-download-file@v1.4.0
         with:
-          url: https://github.com/o01eg/freeorion-sdk/releases/download/v17/FreeOrionSDK_17_MSVC-v143-Win32.zip
+          url: https://github.com/o01eg/freeorion-sdk/releases/download/v18/FreeOrionSDK_18_MSVC-v143-Win32.zip
           target: ../
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v1.3.1

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -102,7 +102,7 @@ else()
 endif()
 
 if(APPLE)
-    set(FreeOrionSDK_VERSION 17)
+    set(FreeOrionSDK_VERSION 18)
     set(FreeOrionSDK_FILE "FreeOrionSDK_${FreeOrionSDK_VERSION}_Clang-MacOSX-10.15-x86_64.tar.bz2")
     if(NOT EXISTS "${CMAKE_BINARY_DIR}/${FreeOrionSDK_FILE}")
     file(DOWNLOAD