Use branch head commit SHA for package manager checks (#248)

Author: mickael-menu

.github/workflows/checks.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: macos-latest
     env:
       scheme: ${{ 'Readium-Package' }}
-      DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
 
     steps:
       - name: Checkout
@@ -73,13 +73,8 @@ jobs:
         run: |
           xcodebuild build -scheme TestApp -destination "platform=$platform,name=$device"
 
-  # The following integration jobs are run only when pushing to `develop` or `main`.
-  # As they use a specific commit hash, they can't run properly from a pull request
-  # opened from forks.
-
   int-spm:
     name: Integration (Swift Package Manager)
-    if: github.event_name == 'push'
     runs-on: macos-latest
     defaults:
       run:
@@ -88,6 +83,12 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      # We can't use the current github.sha with pull_request event, because they will
+      # reference the merge commit which cannot be fetched with SPM.
+      - name: Set commit SHA
+        if: github.event_name == 'pull_request'
+        run: |
+          echo "commit_sha=${{ github.event.pull_request.head.sha }}" >> "$GITHUB_ENV"
       - name: Install dependencies
         run: brew install xcodegen
       - name: Generate project
@@ -98,7 +99,6 @@ jobs:
 
   int-carthage:
     name: Integration (Carthage)
-    if: github.event_name == 'push'
     runs-on: macos-latest
     defaults:
       run:
@@ -107,6 +107,12 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      # We can't use the current github.sha with pull_request event, because they will
+      # reference the merge commit which cannot be fetched with Carthage.
+      - name: Set commit SHA
+        if: github.event_name == 'pull_request'
+        run: |
+          echo "commit_sha=${{ github.event.pull_request.head.sha }}" >> "$GITHUB_ENV"
       - name: Install dependencies
         run: brew install xcodegen
       - name: Generate project

Cartfile

@@ -1,6 +1,6 @@
 github "cezheng/Fuzi" ~> 3.1.3
 github "dexman/Minizip" ~> 1.4.0
-github "krzyzanowskim/CryptoSwift" ~> 1.3.8
+github "krzyzanowskim/CryptoSwift" == 1.5.1 # From 1.6.0, the build fails in GitHub actions
 github "ra1028/DifferenceKit" ~> 1.3.0
 github "readium/GCDWebServer" ~> 3.7.3
 github "scinfu/SwiftSoup" ~> 2.4.3

Package.swift

@@ -20,7 +20,8 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/cezheng/Fuzi.git", from: "3.1.3"),
-        .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "1.3.8"),
+        // From 1.6.0, the build fails in GitHub actions with Carthage
+        .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", "1.5.1"..<"1.6.0"),
         .package(url: "https://github.com/marmelroy/Zip.git", from: "2.1.2"),
         .package(url: "https://github.com/ra1028/DifferenceKit.git", from: "1.3.0"),
         .package(url: "https://github.com/readium/GCDWebServer.git", from: "3.7.3"),

Support/CocoaPods/ReadiumLCP.podspec

@@ -23,5 +23,5 @@ Pod::Spec.new do |s|
 
   s.dependency 'ZIPFoundation', '<= 0.9.11' # 0.9.12 requires iOS 12+
   s.dependency 'SQLite.swift', '~> 0.13'
-  s.dependency 'CryptoSwift', '~> 1.3.8'
+  s.dependency 'CryptoSwift', '<= 1.5.1' # From 1.6.0, the build fails in GitHub actions with Carthage
 end

Support/CocoaPods/ReadiumStreamer.podspec

@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
   s.xcconfig      = { 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2' }
 
   s.dependency 'R2Shared'
-  s.dependency 'CryptoSwift', '~> 1.3.8'
+  s.dependency 'CryptoSwift', '<= 1.5.1' # From 1.6.0, the build fails in GitHub actions
   s.dependency 'Fuzi', '~> 3.0'
   s.dependency 'GCDWebServer', '~> 3.0'
   s.dependency 'Minizip', '~> 1.0'

TestApp/Makefile

@@ -58,7 +58,7 @@ ifdef lcp
 else
 	@cp Integrations/Carthage/project.yml .
 endif
-	carthage update --verbose --platform ios --use-xcframeworks --cache-builds
+	carthage update --verbose --platform ios --use-xcframeworks --cache-builds --no-use-binaries
 	xcodegen generate
 	@echo "\nopen TestApp.xcodeproj"