fix CI release

pebble-dev · Jun 16, 2022 · cc6b8fb · cc6b8fb
1 parent 2c1162c
commit cc6b8fb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Calculate checksums for XCFrameworks
         run: |
           cp Package.swift.template Package.swift
-          echo DEBUG_CHECKSUM=$(swift package compute-checksum build/xcframework.zip) >> $GITHUB_ENV
+          echo RELEASE_CHECKSUM=$(swift package compute-checksum build/xcframework.zip) >> $GITHUB_ENV
         
       - name: Checkout master
         uses: actions/checkout@v2
@@ -49,8 +49,8 @@ jobs:
 
       - name: Update swift package
         run: |
-          sed -e 's|DEBUG-URL|${{ github.server_url }}/${{ github.repository }}/releases/download/${{ github.event.release.tag_name }}/xcframework.zip|;w Package.swift.tmp' Package.swift.template
-          sed -e 's/DEBUG-CHECKSUM/${{ env.DEBUG_CHECKSUM }}/;w Package.swift' Package.swift.tmp
+          sed -e 's|RELEASE-URL|${{ github.server_url }}/${{ github.repository }}/releases/download/${{ github.event.release.tag_name }}/xcframework.zip|;w Package.swift.tmp' Package.swift.template
+          sed -e 's/RELEASE-CHECKSUM/${{ env.RELEASE_CHECKSUM }}/;w Package.swift' Package.swift.tmp
 
       - name: Commit swift package
         run: |

diff --git a/Package.swift.template b/Package.swift.template
@@ -9,22 +9,15 @@ let package = Package(
         // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(
             name: "libpebblecommon",
-            targets: ["libpebblecommon-release"]),
-        .library(
-            name: "libpebblecommon-debug",
-            targets: ["libpebblecommon-debug"])
+            targets: ["libpebblecommon"]
+        )
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
     ],
     targets: [
         .binaryTarget(
-            name: "libpebblecommon-debug",
-            url: "DEBUG-URL",
-            checksum: "DEBUG-CHECKSUM"
-        ),
-        .binaryTarget(
-            name: "libpebblecommon-release",
+            name: "libpebblecommon",
             url: "RELEASE-URL",
             checksum: "RELEASE-CHECKSUM"
         )