dnrops
/
tuist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix release scripts

This commit is contained in:
Pedro Piñera 2021-07-04 21:43:07 +02:00
parent 69630db21b
commit 97c88d78b1
4 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -4,7 +4,7 @@ Please, check out guidelines: https://keepachangelog.com/en/1.0.0/
## Next
## 1.46.0
## 1.46.0 - Momento
## 1.46.0
@ -13,6 +13,10 @@ Please, check out guidelines: https://keepachangelog.com/en/1.0.0/
- Native support for ARM architecture [#3010](https://github.com/tuist/tuist/pull/3010) by [@fortmarek](https://github.com/fortmarek) & [@pepibumur](https://github.com/pepibumur).
- Utility for obtaining the system's Git credentials for authenticating with https://github.com [#3110](https://github.com/tuist/tuist/pull/3110) by [@pepibumur](https://github.com/pepibumur)
### Changed
- **Breaking** Minimum supported Xcode version bumped to 12.2.
## 1.45.1
### Fixed

2
TapestryConfig.swift
View File

@ -7,7 +7,7 @@ let config = TapestryConfig(
.pre(tool: "git", arguments: ["checkout", "main"]),
.pre(tool: "git", arguments: ["pull"]),
.pre(tool: "bundle", arguments: ["install"]),
.pre(tool: "sudo", arguments: ["xcode-select", "-s", "/Applications/Xcode_12.app"]),
.pre(tool: "sudo", arguments: ["xcode-select", "-s", "/Applications/Xcode_12.2.app"]),
.pre(.dependenciesCompatibility([.spm(.all)])),
.pre(tool: "swift", arguments: ["test"]),
.pre(.docsUpdate),

32
projects/fourier/lib/fourier/services/bundle/tuistenv.rb
View File

@ -18,19 +18,18 @@ module Fourier
output_directory = File.expand_path("build", Constants::ROOT_DIRECTORY) if output_directory.nil?
FileUtils.mkdir_p(output_directory) unless Dir.exist?(output_directory)
in_build_directory do |build_directory|
Utilities::Output.section("Building Tuistenv...")
build_tuistenv(build_directory: build_directory)
Dir.mktmpdir do |vendor_directory|
FileUtils.cp(
File.expand_path("release/tuistenv", build_directory),
File.expand_path("tuistenv", vendor_directory)
Dir.mktmpdir do |build_directory|
Dir.mktmpdir do |swift_build_directory|
Utilities::Output.section("Building Tuistenv...")
build_tuistenv(
output_directory: build_directory,
swift_build_directory: swift_build_directory
)
Dir.chdir(vendor_directory) do
Dir.chdir(build_directory) do
output_zip_path = File.expand_path("tuistenv.zip", output_directory)
Utilities::Output.section("Generating #{output_zip_path}...")
Utilities::System.system(
"zip", "-q", "-r", "--symlinks",
output_zip_path,
@ -42,22 +41,13 @@ module Fourier
end
private
def in_build_directory
unless build_directory.nil?
yield(build_directory)
else
Dir.mktmpdir do |tmp_dir|
yield(tmp_dir)
end
end
end
def build_tuistenv(build_directory:)
def build_tuistenv(output_directory:, swift_build_directory:)
Utilities::SwiftPackageManager.build_fat_release_binary(
path: Constants::ROOT_DIRECTORY,
product: "tuistenv",
binary_name: "tuistenv",
output_directory: File.join(build_directory, "release")
output_directory: output_directory,
swift_build_directory: swift_build_directory
)
end
end

5
projects/fourier/lib/fourier/utilities/swift_package_manager.rb
View File

@ -52,11 +52,10 @@ module Fourier
unless File.exist?(output_directory)
Dir.mkdir(output_directory)
end
Utilities::System.system(
"lipo", "-create", "-output", File.expand_path(binary_name, output_directory),
File.join(path, ".build/#{ARM64_TARGET}/release/#{binary_name}"),
File.join(path, ".build/#{X86_64_TARGET}/release/#{binary_name}")
File.join(swift_build_directory, "#{ARM64_TARGET}/release/#{binary_name}"),
File.join(swift_build_directory, "#{X86_64_TARGET}/release/#{binary_name}")
)
end
end