Revert "Update actions to work with xcodeproj"

jurvis · jurvis · commit 54c782c9d81f · 2022-07-04T13:26:39.000-07:00
This reverts commit bf04438.
diff --git a/.github/actions/archive-framework/action.yml b/.github/actions/archive-framework/action.yml
@@ -6,8 +6,8 @@ inputs:
   destination:
     description: Destination
     required: true
-  project:
-    description: Project directory, relative to the xcode folder
+  workspace:
+    description: Workspace Name
     required: true
   platform:
     description: Platform Name
@@ -22,7 +22,7 @@ runs:
 
       xcodebuild archive \
         -scheme '${{ inputs.scheme }}' \
-        -project '${{ inputs.project }}' \
+        -workspace '${{ inputs.workspace }}' \
         -destination '${{ inputs.destination }}' \
         -archivePath "$BUILD_DIR/LDKFramework-${{ inputs.platform }}" \
         ENABLE_BITCODE=NO \
diff --git a/.github/actions/build-for-testing/action.yml b/.github/actions/build-for-testing/action.yml
@@ -6,8 +6,8 @@ inputs:
   destination:
     description: Destination
     required: true
-  project:
-    description: Project directory, relative to the xcode folder
+  workspace:
+    description: Workspace Name
     required: true
 description: Build for testing.
 runs:
@@ -21,7 +21,7 @@ runs:
       xcodebuild clean build-for-testing \
         -allowProvisioningUpdates \
         -allowProvisioningDeviceRegistration \
-        -project '${{ inputs.project }}' \
+        -workspace '${{ inputs.workspace }}' \
         -scheme '${{ inputs.scheme }}' \
         -destination '${{ inputs.destination }}' \
         -resultBundlePath BuildResults.xcresult \
diff --git a/.github/actions/test-without-building/action.yml b/.github/actions/test-without-building/action.yml
@@ -15,8 +15,8 @@ inputs:
   check-name:
     description: The check name
     required: true
-  project:
-    description: Project directory, relative to the xcode folder
+  workspace:
+    description: Workspace Name
     required: true
 runs:
   using: composite
@@ -30,7 +30,7 @@ runs:
       cd xcode
 
       xcodebuild test-without-building \
-      -project '${{ inputs.project }}' \
+      -workspace '${{ inputs.workspace }}' \
       -scheme '${{ inputs.scheme }}' \
       -destination '${{ inputs.destination }}' \
       -resultBundlePath "${{ inputs.artifact-prefix }}-${{ steps.vars.outputs.sha_short }}.xcresult"
diff --git a/.github/workflows/build-frameworks.yml b/.github/workflows/build-frameworks.yml
@@ -24,19 +24,19 @@ jobs:
                     -   scheme: LDKFramework
                         destination: generic/platform=iOS
                         platform: iOS
-                        project: LDK/LightningDevKit.xcodeproj
+                        workspace: LDKFramework.xcworkspace
                     -   scheme: LDKFramework
                         destination: platform=iOS Simulator,OS=15.2,name=iPhone 13 Pro
                         platform: iOS Simulator
-                        project: LDK/LightningDevKit.xcodeproj
+                        workspace: LDKFramework.xcworkspace
                     -   scheme: LDKFramework_Mac
                         destination: generic/platform=OS X
                         platform: OS X
-                        project: LDK/LightningDevKit.xcodeproj
+                        workspace: LDKFramework.xcworkspace
                     -   scheme: LDKFramework
                         destination: platform=macOS,variant=Mac Catalyst,arch=x86_64
                         platform: Mac Catalyst
-                        project: LDK/LightningDevKit.xcodeproj
+                        workspace: LDKFramework.xcworkspace
         env:
             DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
             LDK_C_BINDINGS_BASE: /Users/runner/work/ldk-swift/ldk-swift/bindings/artifacts/ldk-c-bindings
@@ -54,6 +54,6 @@ jobs:
                 id: build
                 uses: ./.github/actions/build-for-testing
                 with:
-                    project: ${{ matrix.configuration['project'] }}
+                    workspace: ${{ matrix.configuration['workspace'] }}
                     scheme: ${{ matrix.configuration['scheme'] }}
                     destination: ${{ matrix.configuration['destination'] }}
diff --git a/.github/workflows/direct-bindings-app-tests.yml b/.github/workflows/direct-bindings-app-tests.yml
@@ -25,11 +25,11 @@ jobs:
         - scheme: DirectBindingsApp
           destination: platform=iOS Simulator,OS=15.4,name=iPhone 13 Pro
           platform: iOS Simulator
-          project: DirectBindingsApp/DirectBindingsApp.xcodeproj
+          workspace: LDKFramework.xcworkspace
         - scheme: DirectBindingsAppTests
           destination: platform=iOS Simulator,OS=15.4,name=iPhone 13 Pro
           platform: iOS Simulator
-          project: DirectBindingsApp/DirectBindingsApp.xcodeproj
+          workspace: LDKFramework.xcworkspace
           xcode-unit-test: DirectBindingsAppTests
     env:
       DEVELOPER_DIR: /Applications/Xcode_13.3.1.app/Contents/Developer
@@ -46,15 +46,15 @@ jobs:
       id: build
       uses: ./.github/actions/build-for-testing
       with:
-        project: ${{ matrix.configuration['project'] }}
+        workspace: ${{ matrix.configuration['workspace'] }}
         scheme: ${{ matrix.configuration['scheme'] }}
         destination: ${{ matrix.configuration['destination'] }}
     - name: Xcode Unit Test
       if: ${{ matrix.configuration['xcode-unit-test'] != '' }}
       continue-on-error: true
       uses: ./.github/actions/test-without-building
       with:
-        project: ${{ matrix.configuration['project'] }}
+        workspace: ${{ matrix.configuration['workspace'] }}
         scheme: ${{ matrix.configuration['scheme'] }}
         destination: ${{ matrix.configuration['destination'] }}
         test-plan: ${{ matrix.configuration['xcode-unit-test'] }}
diff --git a/.github/workflows/release-framework.yml b/.github/workflows/release-framework.yml
@@ -21,19 +21,19 @@ jobs:
         - scheme: LDKFramework
           destination: generic/platform=iOS
           platform: iOS
-          project: LDK/LightningDevKit.xcodeproj
+          workspace: LDKFramework.xcworkspace
         - scheme: LDKFramework
           destination: generic/platform=iOS Simulator
           platform: iOS Simulator
-          project: LDK/LightningDevKit.xcodeproj
+          workspace: LDKFramework.xcworkspace
         - scheme: LDKFramework_Mac
           destination: generic/platform=OS X
           platform: Darwin
-          project: LDK/LightningDevKit.xcodeproj
+          workspace: LDKFramework.xcworkspace
         - scheme: LDKFramework
           destination: generic/platform=macOS
           platform: Catalyst
-          project: LDK/LightningDevKit.xcodeproj
+          workspace: LDKFramework.xcworkspace
     env:
       DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
       BUILD_DIR: ./build
@@ -51,7 +51,7 @@ jobs:
     - name: Archive
       uses: ./.github/actions/archive-framework
       with:
-        project: ${{ matrix.configuration['project'] }}
+        workspace: ${{ matrix.configuration['workspace'] }}
         scheme: ${{ matrix.configuration['scheme'] }}
         destination: ${{ matrix.configuration['destination'] }}
         platform: ${{ matrix.configuration['platform'] }}
diff --git a/.gitignore b/.gitignore
@@ -14,8 +14,10 @@ ci/LDKSwift/Sources/*
 !ci/LDKSwift/Sources/LDKSwift/bindings/Bindings.swift
 
 /xcode/LDKFramework/Build/
+/xcode/LDKFramework/LDKFramework.xcodeproj/project.xcworkspace/
 /xcode/LDKFramework/LDKFramework.xcodeproj/xcuserdata/
 /xcode/DirectBindingsApp/Build/
+/xcode/DirectBindingsApp/DirectBindingsApp.xcodeproj/project.xcworkspace/
 /xcode/DirectBindingsApp/DirectBindingsApp.xcodeproj/xcuserdata/
 
 ## User settings
