diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aa14ab5d..32de0924 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,7 +67,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "cargo install --git https://github.com/axodotdev/cargo-dist/ --branch=macos-codesign cargo-dist" + run: "cargo install --git https://github.com/axodotdev/cargo-dist/ --branch=pkg cargo-dist" - name: Cache cargo-dist uses: actions/upload-artifact@v4 with: @@ -118,10 +118,10 @@ jobs: runs-on: ${{ matrix.runner }} env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + BUILD_MANIFEST_NAME: target/distrib/${{ join(matrix.targets, '-') }}-dist-manifest.json CODESIGN_CERTIFICATE: ${{ secrets.CODESIGN_CERTIFICATE }} CODESIGN_CERTIFICATE_PASSWORD: ${{ secrets.CODESIGN_CERTIFICATE_PASSWORD }} CODESIGN_IDENTITY: ${{ secrets.CODESIGN_IDENTITY }} - BUILD_MANIFEST_NAME: target/distrib/${{ join(matrix.targets, '-') }}-dist-manifest.json steps: - name: enable windows longpaths run: | diff --git a/Cargo.lock b/Cargo.lock index 9448d885..2039874a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -68,7 +68,7 @@ dependencies = [ [[package]] name = "axolotlsay" -version = "0.2.228" +version = "0.2.229" dependencies = [ "assert_cmd", "clap", diff --git a/Cargo.toml b/Cargo.toml index e2fadc34..f243f66e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "axolotlsay" description = "💬 a CLI for learning to distribute CLIs in rust" -version = "0.2.228" +version = "0.2.229" edition = "2021" license = "MIT OR Apache-2.0" repository = "https://github.com/mistydemeo/cargodisttest.git" @@ -22,11 +22,11 @@ lto = "thin" # Config for 'cargo dist' [workspace.metadata.dist] # The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax) -cargo-dist-version = "0.21.1-github-macos-codesign" +cargo-dist-version = "0.21.1-github-pkg" # CI backends to support ci = "github" # The installers to generate for each app -installers = ["shell", "powershell", "npm", "homebrew"] +installers = ["shell", "powershell", "npm", "homebrew", "pkg"] # Target platforms to build apps for (Rust target-triple syntax) targets = ["aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc"] # The archive format to use for windows builds (defaults .zip) @@ -83,3 +83,7 @@ cmake = '3.27.6' [workspace.metadata.dist.github-custom-runners] x86_64-unknown-linux-gnu = "ubuntu-latest" + +# Configuration for the Mac .pkg installer +[workspace.metadata.dist.mac-pkg-config] +identifier = "com.mistydemeo.cargodisttest"