Revert package.swift changes

realm · Mar 13, 2024 · ac64be7 · ac64be7
1 parent 723f7cc
commit ac64be7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
@@ -40,7 +40,7 @@ jobs:
           fi
           echo "version=$REALM_CORE_VERSION" >> "$GITHUB_OUTPUT"
 
-      - name: Checkout Core
+      - name: Clone Core
         uses: actions/checkout@v4
         with:
           repository: realm/realm-core
@@ -50,7 +50,7 @@ jobs:
           fetch-tags: true
 
       - name: Checkout Core@${{ steps.get-core-version.outputs.version }}
-        run: git checkout ${{ steps.get-core-version.outputs.version }}
+        run: git checkout ${{ steps.get-core-version.outputs.version }} --recurse-submodules -f
         working-directory: core
 
       - name: Build for ${{ matrix.target }}
@@ -74,12 +74,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Checkout Core
+      - name: Clone Core
         uses: actions/checkout@v4
         with:
           repository: realm/realm-core
           path: core
-          ref: ${{ needs.build-packages.outputs.core-version }}
+          fetch-depth: 0
+          fetch-tags: true
+
+      - name: Checkout Core@${{ needs.build-packages.outputs.core-version }}
+        run: git checkout ${{ needs.build-packages.outputs.core-version }}
+        working-directory: core
 
       - name: Download binaries
         uses: actions/download-artifact@v4

diff --git a/Package.swift b/Package.swift
@@ -153,7 +153,7 @@ let package = Package(
             targets: ["Realm", "RealmSwift"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/realm/realm-core.git", revision: "v\(coreVersion)")
+        .package(url: "https://github.com/realm/realm-core.git", exact: coreVersion)
     ],
     targets: [
       .target(

diff --git a/build.sh b/build.sh
@@ -1047,7 +1047,7 @@ case "$COMMAND" in
         new_version="$2"
         old_version="$(sed -n 's/^REALM_CORE_VERSION=\(.*\)$/\1/p' "${source_root}/dependencies.list")"
 
-        sed -i '' "s/^REALM_CORE_VERSION=.*/REALM_CORE_VERSION=$new_version/" dependencies.list
+        sed -i '' "s/^REALM_CORE_VERSION=.*/REALM_CORE_VERSION=v$new_version/" dependencies.list
         sed -i '' "s/^let coreVersion =.*/let coreVersion = Version(\"$new_version\")/" Package.swift
         sed -i '' "s/Upgraded realm-core from ? to ?/Upgraded realm-core from $old_version to $new_version/" CHANGELOG.md