diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 856feda9..cac87f42 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -4,12 +4,8 @@ on: workflow_dispatch: inputs: environment: - description: 'Select Environment' - required: true - default: 'testNet' - options: - - testNet - - mainNet + type: environment + description: Select the environment concurrency: group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}' diff --git a/ConcordiumWallet.xcodeproj/project.pbxproj b/ConcordiumWallet.xcodeproj/project.pbxproj index e2072c29..c93547f7 100644 --- a/ConcordiumWallet.xcodeproj/project.pbxproj +++ b/ConcordiumWallet.xcodeproj/project.pbxproj @@ -8133,7 +8133,7 @@ CODE_SIGN_ENTITLEMENTS = ConcordiumWallet/Resources/Entitlements/Mock.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 43; DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -8170,7 +8170,7 @@ CODE_SIGN_ENTITLEMENTS = ConcordiumWallet/Resources/Entitlements/Mock.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 43; DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; INFOPLIST_FILE = "ConcordiumWallet/Resources/ConcordiumWallet-mock-Info.plist"; @@ -8204,7 +8204,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 43; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = K762RM4LQ3; ENABLE_BITCODE = NO; @@ -8225,7 +8225,7 @@ PRODUCT_BUNDLE_IDENTIFIER = software.concordium.mobilewallet.seedphrase.testnet; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Second gen testnet wallet with seed phrase dist"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore software.concordium.mobilewallet.seedphrase.testnet"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG ENABLE_GTU_DROP"; SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/ConcordiumWallet-Briding-Header-File.h"; SWIFT_VERSION = 5.0; @@ -8241,7 +8241,7 @@ CODE_SIGN_ENTITLEMENTS = "ConcordiumWallet/Resources/Entitlements/Concordium ID.entitlements"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 43; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = K762RM4LQ3; ENABLE_BITCODE = NO; @@ -8278,7 +8278,7 @@ CODE_SIGN_ENTITLEMENTS = ConcordiumWallet/Resources/Entitlements/ProdMainNet.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 43; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = K762RM4LQ3; ENABLE_BITCODE = NO; @@ -8298,7 +8298,7 @@ PRODUCT_BUNDLE_IDENTIFIER = software.concordium.mobilewallet.seedphrase.mainnet; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Second gen mainnet wallet with seed phrase dist"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore software.concordium.mobilewallet.seedphrase.mainnet"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/ConcordiumWallet-Briding-Header-File.h"; SWIFT_VERSION = 5.0; @@ -8314,7 +8314,7 @@ CODE_SIGN_ENTITLEMENTS = ConcordiumWallet/Resources/Entitlements/ProdMainNet.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 43; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = K762RM4LQ3; ENABLE_BITCODE = NO; @@ -8334,7 +8334,7 @@ PRODUCT_BUNDLE_IDENTIFIER = software.concordium.mobilewallet.seedphrase.mainnet; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Second gen mainnet wallet with seed phrase dist"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore software.concordium.mobilewallet.seedphrase.mainnet"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/ConcordiumWallet-Briding-Header-File.h"; SWIFT_VERSION = 5.0; @@ -8469,7 +8469,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 43; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = K762RM4LQ3; ENABLE_BITCODE = NO; @@ -8507,7 +8507,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 43; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = K762RM4LQ3; ENABLE_BITCODE = NO; diff --git a/Gemfile.lock b/Gemfile.lock index d6be5f6f..f3535545 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,8 +8,8 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.762.0) - aws-sdk-core (3.172.0) + aws-partitions (1.771.0) + aws-sdk-core (3.173.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) @@ -65,8 +65,8 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - fastimage (2.2.6) - fastlane (2.212.2) + fastimage (2.2.7) + fastlane (2.213.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -90,7 +90,7 @@ GEM json (< 3.0.0) jwt (>= 2.1.0, < 3) mini_magick (>= 4.9.4, < 5.0.0) - multipart-post (~> 2.0.0) + multipart-post (>= 2.0.0, < 3.0.0) naturally (~> 2.2) optparse (~> 0.1.1) plist (>= 3.1.0, < 4.0.0) @@ -106,7 +106,7 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.41.0) + google-apis-androidpublisher_v3 (0.42.0) google-apis-core (>= 0.11.0, < 2.a) google-apis-core (0.11.0) addressable (~> 2.5, >= 2.5.1) @@ -155,7 +155,7 @@ GEM mini_magick (4.12.0) mini_mime (1.1.2) multi_json (1.15.0) - multipart-post (2.0.0) + multipart-post (2.3.0) nanaimo (0.3.0) naturally (2.2.1) optparse (0.1.1) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index b2dd56b4..1f09ef39 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -28,7 +28,7 @@ platform :ios do desc "Export accept to TestFlight" lane :upload_build do begin - match + match(readonly: true) app_store_connect_api_key( key_id: ENV["APPLE_KEY_ID"], issuer_id: ENV['APPLE_KEY_ISSUER'], @@ -37,17 +37,19 @@ platform :ios do is_key_content_base64: true ) increment_build_number( - build_number: latest_testflight_build_number(app_identifier: ENV["APP_IDENTIFIER"])+1, + build_number: [ + latest_testflight_build_number(app_identifier: ENV["APP_IDENTIFIER"])+1, + get_build_number.to_i + ].max, skip_info_plist: true ) gym( - project: $project, scheme: ENV["SCHEME"] ) upload_to_testflight(skip_waiting_for_build_processing: true) rescue => exception on_error("Upload to TestFlight failed: #{exception}") - UI.user_error! "Exporting Concordium Mobile Wallet to TestFlight has failed. " + UI.user_error! "Exporting Concordium Mobile Wallet to TestFlight has failed with error: #{exception}" raise exception end on_success("Mobile Wallet - #{$version_number} (#{$build_number}) has been successfully uploaded to TestFlight.") @@ -75,8 +77,11 @@ platform :ios do message: "Sorry! Unfortunately your CI build has failed! 🙁", channel: ENV['SLACK_CHANNEL'], success: false, - payload: { "Build Date" => Time.new.to_s }, - default_payloads: [:git_branch, :lane, :test_result, :last_git_commit, :last_git_commit_hash] + payload: { + "Build Date" => Time.new.to_s, + "Error message" => message + }, + default_payloads: [:git_branch, :lane, :last_git_commit, :last_git_commit_hash] ) rescue puts 'Oops, something went wrong. Teams returns exception'