Build tvOS wrappers

realm · Jan 12, 2023 · 0085ddc · 0085ddc
1 parent d8aa322
commit 0085ddc
Show file tree

Hide file tree

Showing 12 changed files with 278 additions and 129 deletions.
diff --git a/.github/templates/common.lib.yml b/.github/templates/common.lib.yml
@@ -19,7 +19,7 @@
 #@ androidABIs = [ 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64' ]
 #@ windowsArchs = [ 'Win32', 'x64', 'ARM64' ]
 #@ windowsUWPArchs = [ 'Win32', 'x64', 'ARM', 'ARM64' ]
-#@ iOSArchs = [ 'Simulator', 'Device', 'Catalyst' ]
+#@ applePlatforms = [ 'iOS', 'tvOS'  ]
 
 #@ actionDockerLayerCaching = "satackey/action-docker-layer-caching@cc3f3828e75cbb45f0cf5139b95329c88480aa97" #! 0.0.11
 #@ actionDockerBuild = "docker/build-push-action@6e95f19fb8c9e00a1a391941edbc0ae30c1799f7" #! 2.7.0
@@ -145,9 +145,10 @@ with:
 #@ end
 
 #@ def getWrapperBinaryNames():
-#@ wrapperPlatforms = [ 'macos', 'linux' ]
-#@ for iOSArch in iOSArchs:
-#@   wrapperPlatforms.append("ios-" + iOSArch)
+#@ wrapperPlatforms = [ 'macOS', 'Catalyst', 'Linux' ]
+#@ for platform in applePlatforms:
+#@   wrapperPlatforms.append("apple-" + platform + "-Device")
+#@   wrapperPlatforms.append("apple-" + platform + "-Simulator")
 #@ end
 #@ for androidABI in androidABIs:
 #@   wrapperPlatforms.append("android-" + androidABI)

diff --git a/.github/templates/wrappers.yml b/.github/templates/wrappers.yml
@@ -1,5 +1,5 @@
 #@ load("@ytt:template", "template")
-#@ load("common.lib.yml", "configuration", "checkoutCode", "actionCache", "actionDownloadArtifact", "getWrapperBinaryNames", "androidABIs", "windowsArchs", "windowsUWPArchs", "iOSArchs", "actionDockerLayerCaching", "actionDockerBuild", "actionDockerRun", "uploadArtifacts", "setupXcode")
+#@ load("common.lib.yml", "configuration", "checkoutCode", "actionCache", "actionDownloadArtifact", "getWrapperBinaryNames", "androidABIs", "windowsArchs", "windowsUWPArchs", "applePlatforms", "actionDockerLayerCaching", "actionDockerBuild", "actionDockerRun", "uploadArtifacts", "setupXcode")
 
 #@ wrappersTimeout = 90
 #@ wrappersCacheCondition = "steps.check-cache.outputs.cache-hit != 'true'"
@@ -85,16 +85,21 @@ jobs:
   macos:
     runs-on: macos-12
     name: macOS
-    _: #@ template.replace(buildWrappers("./wrappers/build-macos.sh", "wrappers-macos"))
-  ios:
+    _: #@ template.replace(buildWrappers("./wrappers/build-macos.sh", "wrappers-macOS"))
+  catalyst:
+    runs-on: macos-12
+    name: Catalyst
+    _: #@ template.replace(buildWrappers("pwsh ./wrappers/build-apple-platform.ps1 Catalyst", "wrappers-Catalyst"))
+  apple-platforms:
     runs-on: macos-12
     name: iOS
     strategy:
       matrix:
-        arch: #@ iOSArchs
-    _: #@ template.replace(buildWrappers("pwsh ./wrappers/build-ios.ps1 ${{ matrix.arch }}", "wrappers-ios-${{ matrix.arch }}", enableLto = False, intermediateSteps = [setupXcode()]))
+        platform: #@ applePlatforms
+        target: [ 'Device', 'Simulator' ]
+    _: #@ template.replace(buildWrappers("pwsh ./wrappers/build-apple-platform.ps1 ${{ matrix.platform }} -Targets ${{ matrix.target }}", "wrappers-apple-${{ matrix.platform }}-${{ matrix.target }}", enableLto = False, intermediateSteps = [setupXcode()]))
     #@yaml/map-key-override
-    if: #@ " || ".join([ "needs.check-cache.outputs.wrappers-ios-" + x + " != 'true'" for x in iOSArchs ])
+    if: #@ " || ".join([ "needs.check-cache.outputs.wrappers-apple-" + x + "-Device != 'true'" for x in applePlatforms ])
   linux:
     runs-on: ubuntu-latest
     name: Linux
@@ -104,7 +109,7 @@ jobs:
     if: needs.check-cache.outputs.wrappers-linux != 'true'
     steps:
       - #@ template.replace(checkoutCode("recursive"))
-      - #@ checkCache("wrappers-linux")
+      - #@ checkCache("wrappers-Linux")
       - uses: #@ actionDockerLayerCaching
         continue-on-error: true
         if: #@ wrappersCacheCondition

diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
@@ -45,30 +45,40 @@ jobs:
           $suffix = "alpha.$env:GITHUB_RUN_NUMBER"
         }
         echo "build_suffix=$suffix" >> $Env:GITHUB_OUTPUT
-    - name: Fetch artifacts for macos
+    - name: Fetch artifacts for macOS
       uses: actions/download-artifact@v3
       with:
-        name: wrappers-macos
+        name: wrappers-macOS
         path: wrappers/build
-    - name: Fetch artifacts for linux
+    - name: Fetch artifacts for Catalyst
       uses: actions/download-artifact@v3
       with:
-        name: wrappers-linux
+        name: wrappers-Catalyst
         path: wrappers/build
-    - name: Fetch artifacts for ios-Simulator
+    - name: Fetch artifacts for Linux
       uses: actions/download-artifact@v3
       with:
-        name: wrappers-ios-Simulator
+        name: wrappers-Linux
         path: wrappers/build
-    - name: Fetch artifacts for ios-Device
+    - name: Fetch artifacts for apple-iOS-Device
       uses: actions/download-artifact@v3
       with:
-        name: wrappers-ios-Device
+        name: wrappers-apple-iOS-Device
         path: wrappers/build
-    - name: Fetch artifacts for ios-Catalyst
+    - name: Fetch artifacts for apple-iOS-Simulator
       uses: actions/download-artifact@v3
       with:
-        name: wrappers-ios-Catalyst
+        name: wrappers-apple-iOS-Simulator
+        path: wrappers/build
+    - name: Fetch artifacts for apple-tvOS-Device
+      uses: actions/download-artifact@v3
+      with:
+        name: wrappers-apple-tvOS-Device
+        path: wrappers/build
+    - name: Fetch artifacts for apple-tvOS-Simulator
+      uses: actions/download-artifact@v3
+      with:
+        name: wrappers-apple-tvOS-Simulator
         path: wrappers/build
     - name: Fetch artifacts for android-armeabi-v7a
       uses: actions/download-artifact@v3

diff --git a/.github/workflows/test-code-coverage.yml b/.github/workflows/test-code-coverage.yml
@@ -43,30 +43,40 @@ jobs:
       run: echo "::add-matcher::.github/problem-matchers/csc.json"
     - name: Register msvc problem matcher
       run: echo "::add-matcher::.github/problem-matchers/msvc.json"
-    - name: Fetch artifacts for macos
+    - name: Fetch artifacts for macOS
       uses: actions/download-artifact@v3
       with:
-        name: wrappers-macos
+        name: wrappers-macOS
         path: wrappers/build
-    - name: Fetch artifacts for linux
+    - name: Fetch artifacts for Catalyst
       uses: actions/download-artifact@v3
       with:
-        name: wrappers-linux
+        name: wrappers-Catalyst
         path: wrappers/build
-    - name: Fetch artifacts for ios-Simulator
+    - name: Fetch artifacts for Linux
       uses: actions/download-artifact@v3
       with:
-        name: wrappers-ios-Simulator
+        name: wrappers-Linux
         path: wrappers/build
-    - name: Fetch artifacts for ios-Device
+    - name: Fetch artifacts for apple-iOS-Device
       uses: actions/download-artifact@v3
       with:
-        name: wrappers-ios-Device
+        name: wrappers-apple-iOS-Device
         path: wrappers/build
-    - name: Fetch artifacts for ios-Catalyst
+    - name: Fetch artifacts for apple-iOS-Simulator
       uses: actions/download-artifact@v3
       with:
-        name: wrappers-ios-Catalyst
+        name: wrappers-apple-iOS-Simulator
+        path: wrappers/build
+    - name: Fetch artifacts for apple-tvOS-Device
+      uses: actions/download-artifact@v3
+      with:
+        name: wrappers-apple-tvOS-Device
+        path: wrappers/build
+    - name: Fetch artifacts for apple-tvOS-Simulator
+      uses: actions/download-artifact@v3
+      with:
+        name: wrappers-apple-tvOS-Simulator
         path: wrappers/build
     - name: Fetch artifacts for android-armeabi-v7a
       uses: actions/download-artifact@v3