diff --git a/.gitignore b/.gitignore index 8ab3131..84df8a1 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ DerivedData/ ./hpa.toml ./Version.* /*.json +./hpa diff --git a/Package.resolved b/Package.resolved index 08276c9..8855f94 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "bc31b11e5e7d488e0a9c1bf91cb572d29f782bfd8e43f44157036f8f3d282893", + "originHash" : "f1d1e27e3b3b21d41b872325e0174196a323dc438bf3c9d9f99858856b457c96", "pins" : [ { "identity" : "combine-schedulers", @@ -33,8 +33,8 @@ "kind" : "remoteSourceControl", "location" : "https://git.housh.dev/michael/swift-cli-doc.git", "state" : { - "revision" : "e524056dc65c5ce7a6a77bdea4e5fa0bf724019b", - "version" : "0.2.0" + "revision" : "bbace73d974fd3e6985461431692bea773c7c5d8", + "version" : "0.2.1" } }, { diff --git a/Package.swift b/Package.swift index 5f97142..4692d1a 100644 --- a/Package.swift +++ b/Package.swift @@ -20,7 +20,7 @@ let package = Package( .package(url: "https://github.com/pointfreeco/swift-custom-dump.git", from: "1.3.3"), .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.5.2"), .package(url: "https://github.com/m-housh/swift-shell-client.git", from: "0.1.0"), - .package(url: "https://git.housh.dev/michael/swift-cli-doc.git", from: "0.2.0"), + .package(url: "https://git.housh.dev/michael/swift-cli-doc.git", from: "0.2.1"), .package(url: "https://github.com/m-housh/swift-cli-version.git", from: "0.1.0"), .package(url: "https://github.com/LebJe/TOMLKit.git", from: "0.5.0") ], diff --git a/Sources/hpa/Version.swift b/Sources/hpa/Version.swift index 847b6de..76a01e4 100644 --- a/Sources/hpa/Version.swift +++ b/Sources/hpa/Version.swift @@ -1,2 +1,2 @@ // Do not set this variable, it is set during the build process. -let VERSION: String? = "0.1.1" +let VERSION: String? = "0.1.3" diff --git a/justfile b/justfile index 12f6dfc..fbba002 100644 --- a/justfile +++ b/justfile @@ -10,13 +10,16 @@ formula := "hpa" bottle: @brew uninstall {{formula}} || true @brew tap {{tap}} {{tap_url}} - @brew install --build-bottle {{formula}} - @brew bottle {{formula}} --json + @brew install --build-bottle {{tap}}/{{formula}} + @brew bottle {{formula}} bottle="$(ls *.gz)" && mv "${bottle}" "${bottle/--/-}" # Build the command-line tool. -build mode="debug": - swift build -c {{mode}} +build configuration="debug" arch="arm64": + swift build \ + --disable-sandbox \ + --configuration {{configuration}} \ + --arch {{arch}} alias b := build @@ -26,11 +29,14 @@ build-docker file="Dockerfile" tag="latest": --file docker/{{file}} \ --tag {{docker_image_name}}:{{tag}} . -build-docker-test: (build-docker "Dockerfile.test" "test") - # Build the docker test image used for testing. build-docker-test: (build-docker "Dockerfile.test" "test") +build-universal-binary: (build "release" "arm64") (build "release" "x86_64") + @lipo -create -output {{formula}} \ + ".build/arm64-apple-macosx/release/hpa" \ + ".build/x86_64-apple-macosx/release/hpa" + # Run tests. test *ARGS: swift test {{ARGS}}