diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index ecc3eaccf0..8a04b11c21 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -16,6 +16,7 @@ on: description: "Increment Version Number" type: boolean default: false + required: true workflow_dispatch: inputs: build_environment: diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 1e40c568cf..5cd80f1c4c 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -12,6 +12,10 @@ on: description: "Upload to App Store" type: boolean required: true + build_number: + description: "Upload to App Store" + type: number + required: true workflow_dispatch: inputs: build_environment: @@ -26,6 +30,10 @@ on: description: "Upload to App Store" type: boolean default: false + build_number: + description: "Upload to App Store" + type: number + required: true # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: @@ -202,6 +210,10 @@ jobs: path: ${{ runner.temp }}/build/App.ipa retention-days: 3 + - name: Set build number + working-directory: ${{ env.ANGULAR_DIRECTORY }}/ios/App/App + run: | + xcrun agvtool new-version -all ${{ inputs.build_number }} - name: "Upload app to TestFlight" uses: apple-actions/upload-testflight-build@v1 diff --git a/client/wfnews-war/src/main/angular/ios/App/App.xcodeproj/project.pbxproj b/client/wfnews-war/src/main/angular/ios/App/App.xcodeproj/project.pbxproj index 06ee57d5a9..988c944551 100644 --- a/client/wfnews-war/src/main/angular/ios/App/App.xcodeproj/project.pbxproj +++ b/client/wfnews-war/src/main/angular/ios/App/App.xcodeproj/project.pbxproj @@ -351,11 +351,13 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 413; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = L796QSLV3E; INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MARKETING_VERSION = 1.8.0; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = ca.bc.gov.WildfireInformation; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -375,11 +377,13 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 413; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = L796QSLV3E; INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MARKETING_VERSION = 1.8.0; PRODUCT_BUNDLE_IDENTIFIER = ca.bc.gov.WildfireInformation; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "";