diff --git a/.DS_Store b/.DS_Store deleted file mode 100755 index 793f16a3..00000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 299b1389..04974ca6 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -18,44 +18,42 @@ jobs: - name: Set Xcode Version run: sudo xcode-select -s /Applications/Xcode_15.0.app - - name: Install the Apple certificate and provisioning profile + - name: Get App Store Connect API Key File env: - BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }} - P12_PASSWORD: ${{ secrets.P12_PASSWORD }} - BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }} - KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }} + ASCAPI_KEY: ${{ secrets.ASCAPI_KEY }} run: | - # create variables - CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12 - PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision - KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db + KEY_PATH=$RUNNER_TEMP/ascapi-key.p8 + + echo -n "$ASCAPI_KEY" > $KEY_PATH - # import certificate and provisioning profile from secrets - echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH - echo -n "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode -o $PP_PATH + - name: Resolve Swift dependencies + run: xcodebuild -resolvePackageDependencies -scheme BAGen -configuration Debug - # create temporary keychain - security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH - security set-keychain-settings -lut 21600 $KEYCHAIN_PATH - security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH - - # import certificate to keychain - security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH - security list-keychain -d user -s $KEYCHAIN_PATH - - # apply provisioning profile - mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles - cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles - - - name: Archive + - name: Archive SwiftArchive App + env: + ASCAPI_KEY_ID: ${{ secrets.ASCAPI_KEY_ID }} + ASCAPI_ISSUER_ID: ${{ secrets.ASCAPI_ISSUER_ID }} run: | - xcodebuild -scheme BAGen -configuration Debug DEVELOPMENT_TEAM=B57D8PP775 -sdk 'iphoneos' -destination 'generic/platform=iOS' -archivePath app.xcarchive clean archive CODE_SIGN_IDENTITY="Apple Development" - + KEY_PATH=$RUNNER_TEMP/ascapi-key.p8 + + xcodebuild -scheme BAGen -configuration Debug DEVELOPMENT_TEAM=B57D8PP775 -sdk 'iphoneos' -destination 'generic/platform=iOS' -archivePath BAGen_Debug.xcarchive clean archive CODE_SIGN_IDENTITY="Apple Development" -allowProvisioningUpdates -authenticationKeyPath $KEY_PATH -authenticationKeyID $ASCAPI_KEY_ID -authenticationKeyIssuerID $ASCAPI_ISSUER_ID + xcodebuild -scheme BAGen -configuration Release DEVELOPMENT_TEAM=B57D8PP775 -sdk 'iphoneos' -destination 'generic/platform=iOS' -archivePath BAGen_Release.xcarchive clean archive CODE_SIGN_IDENTITY="Apple Development" -allowProvisioningUpdates -authenticationKeyPath $KEY_PATH -authenticationKeyID $ASCAPI_KEY_ID -authenticationKeyIssuerID $ASCAPI_ISSUER_ID + - name: Export IPA - run: xcodebuild -exportArchive -archivePath app.xcarchive -exportPath ./ -exportOptionsPlist ExportOptions.plist + run: | + mkdir ./Export_Debug + mkdir ./Export_Release + xcodebuild -exportArchive -archivePath BAGen_Debug.xcarchive -exportPath ./Export_Debug -exportOptionsPlist ExportOptions.plist + xcodebuild -exportArchive -archivePath BAGen_Release.xcarchive -exportPath ./Export_Release -exportOptionsPlist ExportOptions.plist + + - name: Upload Debug IPA + uses: actions/upload-artifact@v3 + with: + name: Debug.ipa + path: ./Export_Debug/BAGen.ipa - - name: Upload Artifact - uses: actions/upload-artifact@v2 + - name: Upload Release IPA + uses: actions/upload-artifact@v3 with: - name: ipa - path: ./*.ipa + name: Release.ipa + path: ./Export_Release/BAGen.ipa diff --git a/DownloadRes/defaultlocalgroup_assets_audio/.DS_Store b/DownloadRes/defaultlocalgroup_assets_audio/.DS_Store deleted file mode 100755 index 9a48b9e1..00000000 Binary files a/DownloadRes/defaultlocalgroup_assets_audio/.DS_Store and /dev/null differ diff --git a/DownloadRes/defaultlocalgroup_assets_audio/bgm/.DS_Store b/DownloadRes/defaultlocalgroup_assets_audio/bgm/.DS_Store deleted file mode 100755 index cbe139ac..00000000 Binary files a/DownloadRes/defaultlocalgroup_assets_audio/bgm/.DS_Store and /dev/null differ diff --git a/DownloadRes/defaultlocalgroup_assets_uis/.DS_Store b/DownloadRes/defaultlocalgroup_assets_uis/.DS_Store deleted file mode 100755 index ca060e0c..00000000 Binary files a/DownloadRes/defaultlocalgroup_assets_uis/.DS_Store and /dev/null differ diff --git a/DownloadRes/defaultlocalgroup_assets_uis/01_common/.DS_Store b/DownloadRes/defaultlocalgroup_assets_uis/01_common/.DS_Store deleted file mode 100755 index 458c943e..00000000 Binary files a/DownloadRes/defaultlocalgroup_assets_uis/01_common/.DS_Store and /dev/null differ diff --git a/DownloadRes/defaultlocalgroup_assets_uis/01_common/01_character/.DS_Store b/DownloadRes/defaultlocalgroup_assets_uis/01_common/01_character/.DS_Store deleted file mode 100755 index 4b57a443..00000000 Binary files a/DownloadRes/defaultlocalgroup_assets_uis/01_common/01_character/.DS_Store and /dev/null differ diff --git a/DownloadRes/defaultlocalgroup_assets_uis/03_scenario/.DS_Store b/DownloadRes/defaultlocalgroup_assets_uis/03_scenario/.DS_Store deleted file mode 100755 index dfd1b2c8..00000000 Binary files a/DownloadRes/defaultlocalgroup_assets_uis/03_scenario/.DS_Store and /dev/null differ diff --git a/DownloadRes/defaultlocalgroup_assets_uis/03_scenario/01_background/.DS_Store b/DownloadRes/defaultlocalgroup_assets_uis/03_scenario/01_background/.DS_Store deleted file mode 100755 index 0a6d1aa3..00000000 Binary files a/DownloadRes/defaultlocalgroup_assets_uis/03_scenario/01_background/.DS_Store and /dev/null differ diff --git a/DownloadRes/defaultlocalgroup_assets_uis/03_scenario/02_character/.DS_Store b/DownloadRes/defaultlocalgroup_assets_uis/03_scenario/02_character/.DS_Store deleted file mode 100755 index 075540b8..00000000 Binary files a/DownloadRes/defaultlocalgroup_assets_uis/03_scenario/02_character/.DS_Store and /dev/null differ diff --git a/DownloadRes/defaultlocalgroup_assets_uis/03_scenario/04_scenarioimage/.DS_Store b/DownloadRes/defaultlocalgroup_assets_uis/03_scenario/04_scenarioimage/.DS_Store deleted file mode 100755 index 9024ed60..00000000 Binary files a/DownloadRes/defaultlocalgroup_assets_uis/03_scenario/04_scenarioimage/.DS_Store and /dev/null differ diff --git a/ExportOptions.plist b/ExportOptions.plist index 0ab1f6ab..dad32445 100644 --- a/ExportOptions.plist +++ b/ExportOptions.plist @@ -8,15 +8,8 @@ export method development - provisioningProfiles - - com.Neinnko.BAGen - SwiftArchive - - signingCertificate - Apple Development signingStyle - manual + automatic stripSwiftSymbols teamID