diff --git a/.github/workflows/beta-deployment.yml b/.github/workflows/beta-deployment.yml index d28331d..9801d97 100644 --- a/.github/workflows/beta-deployment.yml +++ b/.github/workflows/beta-deployment.yml @@ -15,12 +15,12 @@ on: workflow_dispatch: jobs: - buildandtest: - name: Build and Test - uses: ./.github/workflows/build-and-test.yml + # buildandtest: + # name: Build and Test + # uses: ./.github/workflows/build-and-test.yml iosapptestflightdeployment: name: iOS App TestFlight Deployment - needs: buildandtest + # needs: buildandtest uses: CS342/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2 secrets: inherit with: diff --git a/.gitignore b/.gitignore index 0f45f76..933b5f6 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,8 @@ # Swift Package Manager *.xcodeproj .swiftpm -.build/ +.build +.derivedData !Balance.xcodeproj # IDE related folders diff --git a/fastlane/ExportOptions.plist b/fastlane/ExportOptions.plist deleted file mode 100644 index a91b6f2..0000000 --- a/fastlane/ExportOptions.plist +++ /dev/null @@ -1,19 +0,0 @@ - - - - - method - app-store - provisioningProfiles - - edu.stanford.cs342.2023.balance - CS342 2023 Balance Team Application - edu.stanford.cs342.2023.balance.watchApp - CS342 2023 Balance Team Watch Application - - signingCertificate - Apple Distribution: Paul Schmiedmayer (637867499T) - signingStyle - manual - - diff --git a/fastlane/ExportOptions.plist.license b/fastlane/ExportOptions.plist.license deleted file mode 100644 index 2a3b468..0000000 --- a/fastlane/ExportOptions.plist.license +++ /dev/null @@ -1,6 +0,0 @@ - -This source file is part of the CS342 2023 Balance Team Application project - -SPDX-FileCopyrightText: 2023 Stanford University - -SPDX-License-Identifier: MIT diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 76fb46f..3074d79 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -35,22 +35,19 @@ platform :ios do lane :build do build_app( derived_data_path: ".derivedData", - destination: "generic/platform=iOS", output_directory: ".build", archive_path: ".build/Balance.xcarchive", + configuration: "Release", + export_options: { + method: "app-store", + signingStyle: "manual", + signingCertificate: "Apple Distribution: Paul Schmiedmayer (637867499T)", + provisioningProfiles: { + "edu.stanford.cs342.2023.balance" => "CS342 2023 Balance Team Application", + "edu.stanford.cs342.2023.balance.watchApp" => "CS342 2023 Balance Team Watch Application" + } + } ) - # This is an unfortunate workaround for a bug in fastlane: https://github.com/fastlane/fastlane/pull/21319 - Dir.chdir("..") do - sh( - " - xcodebuild \ - -exportArchive \ - -exportOptionsPlist ./fastlane/ExportOptions.plist \ - -archivePath ./.build/Balance.xcarchive \ - -exportPath ./.build - " - ) - end end desc "Sign in to the App Store Connect API" @@ -74,7 +71,6 @@ platform :ios do build commit = last_git_commit upload_to_testflight( - ipa: "./.build/Balance.ipa", distribute_external: true, groups: [ "CS342 2023"