From d94055fee9e64cdb866999ab3186d876b92106a1 Mon Sep 17 00:00:00 2001
From: Vlad Velicu <vlad.velicu@couchbase.com>
Date: Mon, 31 Jul 2023 15:40:29 +0100
Subject: [PATCH] package validation

---
 .github/workflows/check_package.yml | 42 ++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/check_package.yml b/.github/workflows/check_package.yml
index e65d93817..0e6a00f1f 100644
--- a/.github/workflows/check_package.yml
+++ b/.github/workflows/check_package.yml
@@ -2,33 +2,45 @@ name: Swift Package
 
 on:
   pull_request:
-    paths: 
-      - "Package.swift"
+    paths: Package.swift
 
 jobs:
-  build:
-    name: Swift ${{ matrix.swift }}
+  build-5_7:
+    name: Swift 5.7
     runs-on: macos-latest
-    strategy:
-      matrix:
-        swift: ["5.7", "5.8"]
-
     steps:
     - uses: actions/checkout@v2
     - uses: webfactory/ssh-agent@v0.7.0
       with:
-          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY_VERIFY }}
+          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
           log-public-key: false
-    - uses: swift-actions/setup-swift@v1.23.0
+    - name: Setup Swift 5.7
+      uses: swift-actions/setup-swift@v1.23.0
       with:
-        swift-version: ${{ matrix.swift }} 
-    - name: Set CBL Version
+        swift-version: "5.7" 
+    - name: Checkout couchbase-lite-ios-release-verify
+      run: |   
+        git clone https://github.com/couchbaselabs/couchbase-lite-ios-release-verify.git
+    - name: Validate
       run: |
-        export VERSION=$(awk -F'/' '/url:/{print $6}' Package.swift | cut -d'_' -f3)
-        echo "VERSION=$VERSION" >> $GITHUB_ENV
+        ./couchbase-lite-ios-release-verify/Scripts/verify_spm.sh -b ${{ github.head_ref }} -ce
+  
+  build-5_8:
+    name: Swift 5.8
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: webfactory/ssh-agent@v0.7.0
+      with:
+          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+          log-public-key: false
+    - name: Setup Swift 5.8
+      uses: swift-actions/setup-swift@v1.23.0
+      with:
+        swift-version: "5.8" 
     - name: Checkout couchbase-lite-ios-release-verify
       run: |   
         git clone https://github.com/couchbaselabs/couchbase-lite-ios-release-verify.git
     - name: Validate
       run: |
-        ./couchbase-lite-ios-release-verify/Scripts/verify_spm.sh -ce -v $VERSION
+        ./couchbase-lite-ios-release-verify/Scripts/verify_spm.sh -b ${{ github.head_ref }} -ce
\ No newline at end of file