diff --git a/Enterprise b/Enterprise index 6ab88ea76e..731c7a7e34 160000 --- a/Enterprise +++ b/Enterprise @@ -1 +1 @@ -Subproject commit 6ab88ea76e345b65868b780c4dbeb14254aaf691 +Subproject commit 731c7a7e34cd4005a2991d9b94a788d54bc7d3eb diff --git a/Tools/Sources/SetupProject.swift b/Tools/Sources/SetupProject.swift index ceb1e30954..7e05510edb 100644 --- a/Tools/Sources/SetupProject.swift +++ b/Tools/Sources/SetupProject.swift @@ -17,7 +17,7 @@ struct SetupProject: ParsableCommand { } func brewInstall() throws { - try Zsh.run(command: "brew install xcodegen swiftgen swiftformat git-lfs sourcery mint kiliankoe/formulae/swift-outdated localazy/tools/localazy peripheryapp/periphery/periphery FelixHerrmann/tap/swift-package-list") + try Zsh.run(command: "brew install xcodegen swiftgen swiftformat git-lfs sourcery mint pkl kiliankoe/formulae/swift-outdated localazy/tools/localazy peripheryapp/periphery/periphery FelixHerrmann/tap/swift-package-list") } func mintPackagesInstall() throws { diff --git a/ci_scripts/ci_common.sh b/ci_scripts/ci_common.sh index b33579ff9e..25a8d582ca 100755 --- a/ci_scripts/ci_common.sh +++ b/ci_scripts/ci_common.sh @@ -30,14 +30,14 @@ setup_xcode_cloud_environment () { } install_xcode_cloud_brew_dependencies () { - brew update && brew install xcodegen + brew update && brew install xcodegen pkl } setup_github_actions_environment() { unset HOMEBREW_NO_INSTALL_FROM_API export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 - brew update && brew install xcodegen swiftlint swiftformat git-lfs a7ex/homebrew-formulae/xcresultparser + brew update && brew install xcodegen swiftlint swiftformat git-lfs pkl a7ex/homebrew-formulae/xcresultparser bundle config path vendor/bundle bundle install --jobs 4 --retry 3 diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 39af55079c..0605ce7782 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -1,6 +1,6 @@ require 'yaml' -enterprise = '../Enterprise/fastlane/Fastfile' +enterprise = '../Enterprise/Pipeline/Scripts/iOS/Fastfile' if File.exist?(enterprise) import enterprise end @@ -169,7 +169,11 @@ lane :config_nightly do |options| target_file_path = "../project.yml" data = YAML.load_file target_file_path - data["include"].append({ "path" => "Variants/Nightly/nightly.yml" }) + + # Check if the "path" already exists in the "include" array + if !data["include"].any? { |item| item["path"] == "Variants/Nightly/nightly.yml" } + data["include"].append({ "path" => "Variants/Nightly/nightly.yml" }) + end config_secrets() @@ -321,7 +325,12 @@ end lane :config_alpha do target_file_path = "../project.yml" data = YAML.load_file target_file_path - data["include"].append({ "path" => "Variants/Alpha/alpha.yml" }) + + # Check if the "path" already exists in the "include" array + if !data["include"].any? { |item| item["path"] == "Variants/Alpha/alpha.yml" } + data["include"].append({ "path" => "Variants/Alpha/alpha.yml" }) + end + File.open(target_file_path, 'w') { |f| YAML.dump(data, f) } xcodegen(spec: "project.yml")