diff --git a/.github/workflows/release-tailwindcss-cli.yml b/.github/workflows/release-tailwindcss-cli.yml index f273eb3..7ab7dc2 100644 --- a/.github/workflows/release-tailwindcss-cli.yml +++ b/.github/workflows/release-tailwindcss-cli.yml @@ -70,7 +70,7 @@ jobs: - name: Create release uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1 with: - tag_name: TailwindCSSCLI-${{ inputs.tailwind_version }} + tag_name: TailwindCSSCLI-${{ inputs.tailwind_version }}-${{ steps.checksum.outputs.checksum }} name: TailwindCSS CLI ${{ inputs.tailwind_version }} body: | ## TailwindCSS CLI Artifact Bundles @@ -82,20 +82,14 @@ jobs: - macOS x64 (`x86_64-apple-darwin`) - macOS ARM64 (`aarch64-apple-darwin`) - ### Usage - Add the artifact bundle to your `Package.swift`: + ### Binary Target Definition ```swift .binaryTarget( name: "TailwindCSSCLI", - url: "https://github.com/${{ github.repository }}/releases/download/TailwindCSSCLI@${{ inputs.tailwind_version }}/tailwindcss.artifactbundleindex", + url: "https://github.com/${{ github.repository }}/releases/download/TailwindCSSCLI-${{ inputs.tailwind_version }}-${{ steps.checksum.outputs.checksum }}/tailwindcss.artifactbundleindex", checksum: "${{ steps.checksum.outputs.checksum }}" ) ``` - - ### Checksum - ``` - ${{ steps.checksum.outputs.checksum }} - ``` draft: false prerelease: false make_latest: false diff --git a/Sources/TailwindCSSCLIArtifactBundler/ArtifactBundleBuilder+File Operations.swift b/Sources/TailwindCSSCLIArtifactBundler/ArtifactBundleBuilder+File Operations.swift index 51bae14..60423b5 100644 --- a/Sources/TailwindCSSCLIArtifactBundler/ArtifactBundleBuilder+File Operations.swift +++ b/Sources/TailwindCSSCLIArtifactBundler/ArtifactBundleBuilder+File Operations.swift @@ -21,9 +21,15 @@ extension ArtifactBundleBuilder { try fileManager.removeItem(atPath: zipPath) } + let bundleDirURL = URL(fileURLWithPath: bundleDir) + let workDirURL = bundleDirURL.deletingLastPathComponent() + let bundleName = bundleDirURL.lastPathComponent + let process = Process() process.executableURL = URL(fileURLWithPath: "/usr/bin/zip") - process.arguments = ["-r", zipPath, bundleDir] + let zipPathURL = URL(fileURLWithPath: zipPath).standardizedFileURL + process.arguments = ["-r", zipPathURL.path, bundleName] + process.currentDirectoryURL = workDirURL try process.run() process.waitUntilExit()