Update Enterprise submodule.

Include pkl in the dependencies.
element-hq · Feb 14, 2025 · 3ebf279 · 3ebf279
1 parent e9818e7
commit 3ebf279
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/Enterprise b/Enterprise
diff --git 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
@@ -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
@@ -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")