From 5d935d6612310d3ddf727b52fe69689a1e80f140 Mon Sep 17 00:00:00 2001 From: cocoa-dev004 <66989461+cocoa-dev004@users.noreply.github.com> Date: Wed, 13 Apr 2022 15:51:30 +0900 Subject: [PATCH] Fixed build pipelines --- .../ExportOptions/AdHoc.plist | 20 ++++++++ .../ExportOptions/Development.plist | 20 ++++++++ .../ExportOptions/Store.plist | 20 ++++++++ .../build/android-build-adhoc-template.yml | 4 +- .../android-build-development-template.yml | 4 +- .../build/android-build-store-template.yml | 4 +- .../build/ios-build-adhoc-template.yml | 43 +++++++++++------ .../build/ios-build-appstore-template.yml | 43 +++++++++++------ .../build/ios-build-development-template.yml | 46 ++++++++++++------- 9 files changed, 152 insertions(+), 52 deletions(-) create mode 100644 Covid19Radar/Covid19Radar.iOS/ExportOptions/AdHoc.plist create mode 100644 Covid19Radar/Covid19Radar.iOS/ExportOptions/Development.plist create mode 100644 Covid19Radar/Covid19Radar.iOS/ExportOptions/Store.plist diff --git a/Covid19Radar/Covid19Radar.iOS/ExportOptions/AdHoc.plist b/Covid19Radar/Covid19Radar.iOS/ExportOptions/AdHoc.plist new file mode 100644 index 000000000..6c355bfea --- /dev/null +++ b/Covid19Radar/Covid19Radar.iOS/ExportOptions/AdHoc.plist @@ -0,0 +1,20 @@ + + + + + compileBitcode + + destination + export + method + ad-hoc + signingCertificate + Apple Distribution + signingStyle + manual + stripSwiftSymbols + + thinning + <none> + + diff --git a/Covid19Radar/Covid19Radar.iOS/ExportOptions/Development.plist b/Covid19Radar/Covid19Radar.iOS/ExportOptions/Development.plist new file mode 100644 index 000000000..d88f65c5c --- /dev/null +++ b/Covid19Radar/Covid19Radar.iOS/ExportOptions/Development.plist @@ -0,0 +1,20 @@ + + + + + compileBitcode + + destination + export + method + development + signingCertificate + Apple Development + signingStyle + manual + stripSwiftSymbols + + thinning + <none> + + diff --git a/Covid19Radar/Covid19Radar.iOS/ExportOptions/Store.plist b/Covid19Radar/Covid19Radar.iOS/ExportOptions/Store.plist new file mode 100644 index 000000000..3b7cd2725 --- /dev/null +++ b/Covid19Radar/Covid19Radar.iOS/ExportOptions/Store.plist @@ -0,0 +1,20 @@ + + + + + destination + export + manageAppVersionAndBuildNumber + + method + app-store + signingCertificate + Apple Distribution + signingStyle + manual + stripSwiftSymbols + + uploadSymbols + + + diff --git a/azure-pipelines/app/templates/build/android-build-adhoc-template.yml b/azure-pipelines/app/templates/build/android-build-adhoc-template.yml index 14620cdee..f77a32a16 100644 --- a/azure-pipelines/app/templates/build/android-build-adhoc-template.yml +++ b/azure-pipelines/app/templates/build/android-build-adhoc-template.yml @@ -33,11 +33,11 @@ steps: - script: | cd $(Build.ArtifactStagingDirectory)/ ARCHIVE_FILE=`find *.apk | head -1` - mv $ARCHIVE_FILE jp.go.mhlw.covid19radar_adhoc_$(Environment)_v$(AppVersion)_$(buildVersion).apk + mv $ARCHIVE_FILE covid19radar_adhoc_$(Environment)_v$(AppVersion)_$(buildVersion).apk ls -la displayName: 'Change archive name' - task: PublishBuildArtifacts@1 displayName: 'Publish APK' inputs: - ArtifactName: 'archives_adhoc_$(Environment)_v$(AppVersion)_$(buildVersion)' + ArtifactName: 'android_adhoc_$(Environment)_v$(AppVersion)_$(buildVersion)' diff --git a/azure-pipelines/app/templates/build/android-build-development-template.yml b/azure-pipelines/app/templates/build/android-build-development-template.yml index 448432d8a..fabdc6463 100644 --- a/azure-pipelines/app/templates/build/android-build-development-template.yml +++ b/azure-pipelines/app/templates/build/android-build-development-template.yml @@ -33,11 +33,11 @@ steps: - script: | cd $(Build.ArtifactStagingDirectory)/ ARCHIVE_FILE=`find *.apk | head -1` - mv $ARCHIVE_FILE jp.go.mhlw.covid19radar_development_$(Environment)_v$(AppVersion)_$(buildVersion).apk + mv $ARCHIVE_FILE covid19radar_development_$(Environment)_v$(AppVersion)_$(buildVersion).apk ls -la displayName: 'Change archive name' - task: PublishBuildArtifacts@1 displayName: 'Publish APK' inputs: - ArtifactName: 'archives_development_$(Environment)_v$(AppVersion)_$(buildVersion)' + ArtifactName: 'android_development_$(Environment)_v$(AppVersion)_$(buildVersion)' diff --git a/azure-pipelines/app/templates/build/android-build-store-template.yml b/azure-pipelines/app/templates/build/android-build-store-template.yml index facbf06be..8494da8ac 100644 --- a/azure-pipelines/app/templates/build/android-build-store-template.yml +++ b/azure-pipelines/app/templates/build/android-build-store-template.yml @@ -33,11 +33,11 @@ steps: - script: | cd $(Build.ArtifactStagingDirectory)/ ARCHIVE_FILE=`find *.apk | head -1` - mv $ARCHIVE_FILE jp.go.mhlw.covid19radar_store_$(Environment)_v$(AppVersion)_$(buildVersion).apk + mv $ARCHIVE_FILE covid19radar_store_$(Environment)_v$(AppVersion)_$(buildVersion).apk ls -la displayName: 'Change archive name' - task: PublishBuildArtifacts@1 displayName: 'Publish APK' inputs: - ArtifactName: 'archives_store_$(Environment)_v$(AppVersion)_$(buildVersion)' + ArtifactName: 'android_store_$(Environment)_v$(AppVersion)_$(buildVersion)' diff --git a/azure-pipelines/app/templates/build/ios-build-adhoc-template.yml b/azure-pipelines/app/templates/build/ios-build-adhoc-template.yml index 7ee573fac..cb4740a1c 100644 --- a/azure-pipelines/app/templates/build/ios-build-adhoc-template.yml +++ b/azure-pipelines/app/templates/build/ios-build-adhoc-template.yml @@ -27,36 +27,49 @@ steps: inputs: solutionFile: Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj configuration: Release + packageApp: false signingIdentity: 'Apple Distribution' signingProvisioningProfileID: 'cdc74b34-c91f-4bc9-8c5a-3e904ae2635e' + args: '/p:ArchiveOnBuild=true' + +- bash: | + XCARCHIVE_PATH=`find ~/Library/Developer/Xcode/Archives -name "*.xcarchive" | head -1` + echo "$XCARCHIVE_PATH" + echo "##vso[task.setvariable variable=xcarchivePath;]$XCARCHIVE_PATH" + displayName: Set Archive Path + +- script: | + EXPORT_OPTIONS=./Covid19Radar/Covid19Radar.iOS/ExportOptions/AdHoc.plist + plutil -insert 'provisioningProfiles' -json '{"$(APP_PACKAGE_NAME)":"$(iOS_ProfileName_AdHoc)"}' $EXPORT_OPTIONS + plutil -insert 'teamID' -string '$(iOS_TeamId)' $EXPORT_OPTIONS + displayName: Edit ExportOptions + +- script: | + EXPORT_OPTIONS=./Covid19Radar/Covid19Radar.iOS/ExportOptions/AdHoc.plist + xcodebuild -exportArchive -archivePath "$(xcarchivePath)" -exportPath ./Covid19Radar/Covid19Radar.iOS/ipa/ -exportOptionsPlist $EXPORT_OPTIONS + displayName: Export from xcarchive to ipa - task: CopyFiles@2 displayName: 'Copy IPA to: Build.ArtifactStagingDirectory' inputs: - SourceFolder: Covid19Radar/Covid19Radar.iOS/bin/iPhone/Release + SourceFolder: ./Covid19Radar/Covid19Radar.iOS/ipa Contents: '*.ipa' TargetFolder: '$(Build.ArtifactStagingDirectory)' - script: | - mkdir -p symbols - find . -type d -name '*.dSYM' | xargs -J % cp -v -R % $(System.DefaultWorkingDirectory)/symbols - displayName: Copy symbol files to staging - -- task: CopyFiles@2 - displayName: 'Copy symbols to: Build.ArtifactStagingDirectory' - inputs: - Contents: | - **/symbols/**/* - TargetFolder: '$(Build.ArtifactStagingDirectory)' + cp -r "$(xcarchivePath)" "$(Build.ArtifactStagingDirectory)" + displayName: "Copy archve to: Build.ArtifactStagingDirectory" - script: | - cd $(Build.ArtifactStagingDirectory)/ - ARCHIVE_FILE=`find *.ipa | head -1` - mv $ARCHIVE_FILE jp.go.mhlw.covid19radar_adhoc_$(Environment)_v$(AppVersion)_$(buildVersion).ipa + cd $(Build.ArtifactStagingDirectory) + IPA_FILE=`find *.ipa | head -1` + mv "$IPA_FILE" covid19radar_adhoc_$(Environment)_v$(AppVersion)_$(buildVersion).ipa + ARCHIVE_FILE=`find *.xcarchive | head -1` + mv "$ARCHIVE_FILE" covid19radar_adhoc_$(Environment)_v$(AppVersion)_$(buildVersion).xcarchive ls -la displayName: 'Change archive name' - task: PublishBuildArtifacts@1 displayName: 'Publish IPA and symbols' inputs: - ArtifactName: 'archives_adhoc_$(Environment)_v$(AppVersion)_$(buildVersion)' + ArtifactName: 'ios_adhoc_$(Environment)_v$(AppVersion)_$(buildVersion)' diff --git a/azure-pipelines/app/templates/build/ios-build-appstore-template.yml b/azure-pipelines/app/templates/build/ios-build-appstore-template.yml index 738e67823..bd8b77c9c 100644 --- a/azure-pipelines/app/templates/build/ios-build-appstore-template.yml +++ b/azure-pipelines/app/templates/build/ios-build-appstore-template.yml @@ -27,36 +27,49 @@ steps: inputs: solutionFile: Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj configuration: Release + packageApp: false signingIdentity: 'Apple Distribution' signingProvisioningProfileID: '5265b13d-3a36-4e43-b4b2-2b406d6de095' + args: '/p:ArchiveOnBuild=true' + +- bash: | + XCARCHIVE_PATH=`find ~/Library/Developer/Xcode/Archives -name "*.xcarchive" | head -1` + echo "$XCARCHIVE_PATH" + echo "##vso[task.setvariable variable=xcarchivePath;]$XCARCHIVE_PATH" + displayName: Set Archive Path + +- script: | + EXPORT_OPTIONS=./Covid19Radar/Covid19Radar.iOS/ExportOptions/Store.plist + plutil -insert 'provisioningProfiles' -json '{"$(APP_PACKAGE_NAME)":"$(iOS_ProfileName_Store)"}' $EXPORT_OPTIONS + plutil -insert 'teamID' -string '$(iOS_TeamId)' $EXPORT_OPTIONS + displayName: Edit ExportOptions + +- script: | + EXPORT_OPTIONS=./Covid19Radar/Covid19Radar.iOS/ExportOptions/Store.plist + xcodebuild -exportArchive -archivePath "$(xcarchivePath)" -exportPath ./Covid19Radar/Covid19Radar.iOS/ipa/ -exportOptionsPlist $EXPORT_OPTIONS + displayName: Export from xcarchive to ipa - task: CopyFiles@2 displayName: 'Copy IPA to: Build.ArtifactStagingDirectory' inputs: - SourceFolder: Covid19Radar/Covid19Radar.iOS/bin/iPhone/Release + SourceFolder: ./Covid19Radar/Covid19Radar.iOS/ipa Contents: '*.ipa' TargetFolder: '$(Build.ArtifactStagingDirectory)' - script: | - mkdir -p symbols - find . -type d -name '*.dSYM' | xargs -J % cp -v -R % $(System.DefaultWorkingDirectory)/symbols - displayName: Copy symbol files to staging - -- task: CopyFiles@2 - displayName: 'Copy symbols to: Build.ArtifactStagingDirectory' - inputs: - Contents: | - **/symbols/**/* - TargetFolder: '$(Build.ArtifactStagingDirectory)' + cp -r "$(xcarchivePath)" "$(Build.ArtifactStagingDirectory)" + displayName: "Copy archve to: Build.ArtifactStagingDirectory" - script: | - cd $(Build.ArtifactStagingDirectory)/ - ARCHIVE_FILE=`find *.ipa | head -1` - mv $ARCHIVE_FILE jp.go.mhlw.covid19radar_appstore_$(Environment)_v$(AppVersion)_$(buildVersion).ipa + cd $(Build.ArtifactStagingDirectory) + IPA_FILE=`find *.ipa | head -1` + mv "$IPA_FILE" covid19radar_store_$(Environment)_v$(AppVersion)_$(buildVersion).ipa + ARCHIVE_FILE=`find *.xcarchive | head -1` + mv "$ARCHIVE_FILE" covid19radar_store_$(Environment)_v$(AppVersion)_$(buildVersion).xcarchive ls -la displayName: 'Change archive name' - task: PublishBuildArtifacts@1 displayName: 'Publish IPA and symbols' inputs: - ArtifactName: 'archives_appstore_$(Environment)_v$(AppVersion)_$(buildVersion)' + ArtifactName: 'ios_store_$(Environment)_v$(AppVersion)_$(buildVersion)' diff --git a/azure-pipelines/app/templates/build/ios-build-development-template.yml b/azure-pipelines/app/templates/build/ios-build-development-template.yml index 2cab7201c..5d27a7e52 100644 --- a/azure-pipelines/app/templates/build/ios-build-development-template.yml +++ b/azure-pipelines/app/templates/build/ios-build-development-template.yml @@ -32,9 +32,10 @@ steps: inputs: solutionFile: Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj configuration: Debug - args: '/p:DefineConstants=DEBUG=0' + packageApp: false signingIdentity: 'Apple Development' signingProvisioningProfileID: 'e673e188-1224-4218-9e18-c92103039c24' + args: '/p:ArchiveOnBuild=true /p:DefineConstants=DEBUG=0' condition: and(succeeded(), eq('${{ parameters.isDefineDebug }}', 'false')) - task: XamariniOS@2 @@ -42,37 +43,50 @@ steps: inputs: solutionFile: Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj configuration: Debug + packageApp: false signingIdentity: 'Apple Development' signingProvisioningProfileID: 'e673e188-1224-4218-9e18-c92103039c24' + args: '/p:ArchiveOnBuild=true' condition: and(succeeded(), eq('${{ parameters.isDefineDebug }}', 'true')) +- bash: | + XCARCHIVE_PATH=`find ~/Library/Developer/Xcode/Archives -name "*.xcarchive" | head -1` + echo "$XCARCHIVE_PATH" + echo "##vso[task.setvariable variable=xcarchivePath;]$XCARCHIVE_PATH" + displayName: Set Archive Path + +- script: | + EXPORT_OPTIONS=./Covid19Radar/Covid19Radar.iOS/ExportOptions/Development.plist + plutil -insert 'provisioningProfiles' -json '{"$(APP_PACKAGE_NAME)":"$(iOS_ProfileName_Development)"}' $EXPORT_OPTIONS + plutil -insert 'teamID' -string '$(iOS_TeamId)' $EXPORT_OPTIONS + displayName: Edit ExportOptions + +- script: | + EXPORT_OPTIONS=./Covid19Radar/Covid19Radar.iOS/ExportOptions/Development.plist + xcodebuild -exportArchive -archivePath "$(xcarchivePath)" -exportPath ./Covid19Radar/Covid19Radar.iOS/ipa/ -exportOptionsPlist $EXPORT_OPTIONS + displayName: Export from xcarchive to ipa + - task: CopyFiles@2 displayName: 'Copy IPA to: Build.ArtifactStagingDirectory' inputs: - SourceFolder: Covid19Radar/Covid19Radar.iOS/bin/iPhone/Debug + SourceFolder: ./Covid19Radar/Covid19Radar.iOS/ipa Contents: '*.ipa' TargetFolder: '$(Build.ArtifactStagingDirectory)' - script: | - mkdir -p symbols - find . -type d -name '*.dSYM' | xargs -J % cp -v -R % $(System.DefaultWorkingDirectory)/symbols - displayName: Copy symbol files to staging - -- task: CopyFiles@2 - displayName: 'Copy symbols to: Build.ArtifactStagingDirectory' - inputs: - Contents: | - **/symbols/**/* - TargetFolder: '$(Build.ArtifactStagingDirectory)' + cp -r "$(xcarchivePath)" "$(Build.ArtifactStagingDirectory)" + displayName: "Copy archve to: Build.ArtifactStagingDirectory" - script: | - cd $(Build.ArtifactStagingDirectory)/ - ARCHIVE_FILE=`find *.ipa | head -1` - mv $ARCHIVE_FILE jp.go.mhlw.covid19radar_development_$(Environment)_v$(AppVersion)_$(buildVersion).ipa + cd $(Build.ArtifactStagingDirectory) + IPA_FILE=`find *.ipa | head -1` + mv "$IPA_FILE" covid19radar_development_$(Environment)_v$(AppVersion)_$(buildVersion).ipa + ARCHIVE_FILE=`find *.xcarchive | head -1` + mv "$ARCHIVE_FILE" covid19radar_development_$(Environment)_v$(AppVersion)_$(buildVersion).xcarchive ls -la displayName: 'Change archive name' - task: PublishBuildArtifacts@1 displayName: 'Publish IPA and symbols' inputs: - ArtifactName: 'archives_development_$(Environment)_v$(AppVersion)_$(buildVersion)' + ArtifactName: 'ios_development_$(Environment)_v$(AppVersion)_$(buildVersion)'