swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-10 13:37:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Enterprise submodule.

Browse Source 
Include pkl in the dependencies.
This commit is contained in:
Doug 2025-02-13 16:01:01 +00:00 committed by Doug
parent d96304b3bb
commit b71c93dfaa
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Enterprise

@ -1 +1 @@
Subproject commit 6ab88ea76e345b65868b780c4dbeb14254aaf691 Subproject commit 731c7a7e34cd4005a2991d9b94a788d54bc7d3eb

2
Tools/Sources/SetupProject.swift
View File

@ -17,7 +17,7 @@ struct SetupProject: ParsableCommand {
} }
func brewInstall() throws { 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 { func mintPackagesInstall() throws {

4
ci_scripts/ci_common.sh
View File

@ -30,14 +30,14 @@ setup_xcode_cloud_environment () {
} }
install_xcode_cloud_brew_dependencies () { install_xcode_cloud_brew_dependencies () {
brew update && brew install xcodegen brew update && brew install xcodegen pkl
} }
setup_github_actions_environment() { setup_github_actions_environment() {
unset HOMEBREW_NO_INSTALL_FROM_API unset HOMEBREW_NO_INSTALL_FROM_API
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 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 config path vendor/bundle
bundle install --jobs 4 --retry 3 bundle install --jobs 4 --retry 3

15
fastlane/Fastfile
View File

@ -1,6 +1,6 @@
require 'yaml' require 'yaml'
enterprise = '../Enterprise/fastlane/Fastfile' enterprise = '../Enterprise/Pipeline/Scripts/iOS/Fastfile'
if File.exist?(enterprise) if File.exist?(enterprise)
import enterprise import enterprise
end end
@ -169,7 +169,11 @@ lane :config_nightly do |options|
target_file_path = "../project.yml" target_file_path = "../project.yml"
data = YAML.load_file target_file_path 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() config_secrets()
@ -321,7 +325,12 @@ end
lane :config_alpha do lane :config_alpha do
target_file_path = "../project.yml" target_file_path = "../project.yml"
data = YAML.load_file target_file_path 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) } File.open(target_file_path, 'w') { |f| YAML.dump(data, f) }
xcodegen(spec: "project.yml") xcodegen(spec: "project.yml")