ci: use macos12, get dep.7z

Author: wang-bin

.github/workflows/build.yml

@@ -19,7 +19,7 @@ env:
 jobs:
   macOS:
     # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/configuring-a-workflow#configuring-a-build-matrix
-    runs-on: macos-11
+    runs-on: macos-12
     env:
       TARGET_OS: 'macOS'
       TARGET_ARCH: ${{ matrix.arch }}
@@ -97,7 +97,7 @@ jobs:
 
 
   macCatalyst:
-    runs-on: macos-11
+    runs-on: macos-12
     env:
       TARGET_OS: 'macCatalyst'
     strategy:
@@ -162,7 +162,7 @@ jobs:
 
 
   iOS:
-    runs-on: macos-11
+    runs-on: macos-12
     env:
       TARGET_OS: iOS
     strategy:
@@ -228,7 +228,7 @@ jobs:
       run: sshpass -p ${SF_PW} scp -o StrictHostKeyChecking=no mdk-sdk-${TARGET_OS}.tar.xz ${SF_USER}@frs.sourceforge.net:/home/frs/project/mdk-sdk/nightly/
 
   iOSSimulator:
-    runs-on: macos-latest
+    runs-on: macos-12
     env:
       TARGET_OS: iOSSimulator
     strategy:
@@ -290,7 +290,7 @@ jobs:
         path: mdk-sdk-${{ env.TARGET_OS }}.tar.xz
 
   Apple:
-    runs-on: macos-latest
+    runs-on: macos-12
     needs: [macOS, iOS, iOSSimulator, macCatalyst]
     steps:
     - uses: actions/checkout@v2

ci-before-build.sh

@@ -77,10 +77,6 @@ if [[ "$EXTERNAL_DEP_CACHE_HIT" != "true" ]]; then
       mkdir -p external/lib/sunxi/armv7
       cp -af ${FFPKG}/lib/* external/lib/sunxi/armv7 #single arch package
   elif [ "$TARGET_OS" == "windows-desktop" ]; then
-      curl -kL -o glfw3.7z https://sourceforge.net/projects/mdk-sdk/files/deps/glfw3.7z/download
-      7z x glfw3.7z
-      cp -af glfw3/include/GLFW external/include/
-      cp -af glfw3/lib/* external/lib/windows/
       # TODO: download in cmake(if check_include_files failed)
       curl -kL -o vk.zip https://github.com/KhronosGroup/Vulkan-Headers/archive/master.zip
       7z x vk.zip
@@ -96,6 +92,11 @@ if [[ "$EXTERNAL_DEP_CACHE_HIT" != "true" ]]; then
       curl -kL -o external/include/${h} https://www.khronos.org/registry/EGL/api/${h}
     done
   fi
+  if [[ "$TARGET_OS" == "win"* || "$TARGET_OS" == "uwp"* || "$TARGET_OS" == macOS || "$TARGET_OS" == "linux" ]]; then
+    curl -kL -o dep.7z https://sourceforge.net/projects/mdk-sdk/files/deps/dep.7z/download
+    7z x dep.7z
+    cp -af dep/* external/
+  fi
 fi
 
 if [[ "$SYSROOT_CACHE_HIT" != "true" ]]; then