Restored xcode 13.3 build

Macos 12 is available for public beta in actions : actions/runner-images#5446
pcpl2 · Apr 30, 2022 · 831496b · 831496b
1 parent 6f3adf2
commit 831496b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/SelfUpdate.yml b/.github/workflows/SelfUpdate.yml
@@ -48,8 +48,8 @@ jobs:
           os: macos-11
         - xcode: '13.2'
           os: macos-11
-#        - xcode: '13.3'
-#          os: macos-12
+        - xcode: '13.3'
+          os: macos-12
     steps:
       - name: Check out realm repo
         uses: actions/checkout@v2
@@ -137,8 +137,8 @@ jobs:
             mv Realm_13.2.xcframework-art/Realm_13.2.xcframework.zip ./Realm_13.2.xcframework.zip
             mv RealmSwift_13.2.xcframework-art/RealmSwift_13.2.xcframework.zip ./RealmSwift_13.2.xcframework.zip
 
-#            mv Realm_13.3.xcframework-art/Realm_13.3.xcframework.zip ./Realm_13.3.xcframework.zip
-#            mv RealmSwift_13.3.xcframework-art/RealmSwift_13.3.xcframework.zip ./RealmSwift_13.3.xcframework.zip
+            mv Realm_13.3.xcframework-art/Realm_13.3.xcframework.zip ./Realm_13.3.xcframework.zip
+            mv RealmSwift_13.3.xcframework-art/RealmSwift_13.3.xcframework.zip ./RealmSwift_13.3.xcframework.zip
 
       - name: Display structure of downloaded files
         run: |
@@ -169,8 +169,8 @@ jobs:
            echo "::set-output name=r_132_sha::$(sha256sum Realm_13.2.xcframework.zip | grep -o '^\S*')"
            echo "::set-output name=rs_132_sha::$(sha256sum RealmSwift_13.2.xcframework.zip | grep -o '^\S*')"
 
-#           echo "::set-output name=r_133_sha::$(sha256sum Realm_13.3.xcframework.zip | grep -o '^\S*')"
-#           echo "::set-output name=rs_133_sha::$(sha256sum RealmSwift_13.3.xcframework.zip | grep -o '^\S*')"
+           echo "::set-output name=r_133_sha::$(sha256sum Realm_13.3.xcframework.zip | grep -o '^\S*')"
+           echo "::set-output name=rs_133_sha::$(sha256sum RealmSwift_13.3.xcframework.zip | grep -o '^\S*')"
 
       - name: Generate Package.swift
         env: 
@@ -197,8 +197,8 @@ jobs:
           R_132_SHA: '${{ steps.rSha.outputs.r_132_sha }}'
           RS_132_SHA: '${{ steps.rSha.outputs.rs_132_sha }}'
 
-#          R_133_SHA: '${{ steps.rSha.outputs.r_133_sha }}'
-#          RS_133_SHA: '${{ steps.rSha.outputs.rs_133_sha }}'
+          R_133_SHA: '${{ steps.rSha.outputs.r_133_sha }}'
+          RS_133_SHA: '${{ steps.rSha.outputs.rs_133_sha }}'
         run: |
           cd main
           sudo chmod +x GeneratePackageSwift.sh
@@ -253,5 +253,5 @@ jobs:
             ./Realm_13.2.xcframework.zip
             ./RealmSwift_13.2.xcframework.zip 
 
-#            ./Realm_13.3.xcframework.zip
-#            ./RealmSwift_13.3.xcframework.zip 
+            ./Realm_13.3.xcframework.zip
+            ./RealmSwift_13.3.xcframework.zip 
diff --git a/GeneratePackageSwift.sh b/GeneratePackageSwift.sh
@@ -8,7 +8,11 @@ let realmVersion = \"$R_VER\"
 func buildTargets() -> [Target] {
     let baseURL = \"https://github.com/pcpl2/RealmPrebuilt/releases/download/\(realmVersion)\"
 
-    if swift(>=5.5.2)
+    #if swift(>=5.6)
+    let xcodeVersion = \"13.3\"
+    let realmChecksum = \"$R_133_SHA\"
+    let realmSwiftChecksum = \"$RS_133_SHA\"
+    #elseif swift(>=5.5.2)
     let xcodeVersion = \"13.2\"
     let realmChecksum = \"$R_132_SHA\"
     let realmSwiftChecksum = \"$RS_132_SHA\"