Try to build iOS #2

realm · Apr 7, 2021 · 5c39f4f · 5c39f4f
1 parent 73d47e7
commit 5c39f4f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 26 deletions.
diff --git a/.github/templates/main.yml b/.github/templates/main.yml
@@ -19,14 +19,6 @@ with:
   key: #@ key
 #@ end
 
-#@ def storeCache(key):
-name: Store cache
-uses: actions/cache@v2
-with:
-  path: ./wrappers/build/**
-  key: #@ key
-#@ end
-
 #@ def cacheCondition():
 #@overlay/match missing_ok=True
 if: steps.check-cache.outputs.cache-hit != 'true'
@@ -50,10 +42,8 @@ steps:
   - name: Build wrappers
     run: #@ actualCommand
     _: #@ template.replace(cacheCondition())
-  - #@ template.replace([overlay.apply(storeCache(cacheKey), cacheCondition())])
 #@ end
 
-
 ---
 name: build and test
 on:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,12 +23,6 @@ jobs:
     - name: Build wrappers
       run: ./wrappers/build-macos.sh --configuration=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=${{ github.event_name == 'pull_request' && 'ON' || 'OFF' }}
       if: steps.check-cache.outputs.cache-hit != 'true'
-    - name: Store cache
-      uses: actions/cache@v2
-      with:
-        path: ./wrappers/build/**
-        key: wrappers-macos-Release-${{ github.event_name == 'pull_request' && 'ON' || 'OFF' }}-${{hashFiles('./wrappers/**')}}
-      if: steps.check-cache.outputs.cache-hit != 'true'
   build-wrappers-ios:
     runs-on: macos-latest
     name: Build iOS wrappers
@@ -46,9 +40,3 @@ jobs:
     - name: Build wrappers
       run: ./wrappers/build-ios.sh --configuration=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=${{ github.event_name == 'pull_request' && 'ON' || 'OFF' }}
       if: steps.check-cache.outputs.cache-hit != 'true'
-    - name: Store cache
-      uses: actions/cache@v2
-      with:
-        path: ./wrappers/build/**
-        key: wrappers-ios-Release-${{ github.event_name == 'pull_request' && 'ON' || 'OFF' }}-${{hashFiles('./wrappers/**')}}
-      if: steps.check-cache.outputs.cache-hit != 'true'
diff --git a/wrappers/build-ios.sh b/wrappers/build-ios.sh
@@ -26,10 +26,10 @@ function build() {
 
   # This is a workaround for CMAKE_IOS_INSTALL_COMBINED removing @rpath from LC_DYLIB_ID.
   # Reported here: https://cmake.org/pipermail/cmake/2018-October/068316.html
-  rm build/iOS/$REALM_CMAKE_CONFIGURATION/realm-wrappers.framework/realm-wrappers
-  xcrun lipo -create cmake/iOS/src/$REALM_CMAKE_CONFIGURATION-iphoneos/realm-wrappers.framework/realm-wrappers \
-                     cmake/iOS/src/$REALM_CMAKE_CONFIGURATION-iphonesimulator/realm-wrappers.framework/realm-wrappers \
-             -output build/iOS/$REALM_CMAKE_CONFIGURATION/realm-wrappers.framework/realm-wrappers
+  rm "$SCRIPT_DIRECTORY"/build/iOS/$REALM_CMAKE_CONFIGURATION/realm-wrappers.framework/realm-wrappers
+  xcrun lipo -create "$SCRIPT_DIRECTORY"/cmake/iOS/src/$REALM_CMAKE_CONFIGURATION-iphoneos/realm-wrappers.framework/realm-wrappers \
+                     "$SCRIPT_DIRECTORY"/cmake/iOS/src/$REALM_CMAKE_CONFIGURATION-iphonesimulator/realm-wrappers.framework/realm-wrappers \
+             -output "$SCRIPT_DIRECTORY"/build/iOS/$REALM_CMAKE_CONFIGURATION/realm-wrappers.framework/realm-wrappers
 }
 
 build