diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index beff7051..8e7b7987 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,7 +58,7 @@ jobs: with: submodules: recursive - name: Install cargo-dist - run: "cargo install --git https://github.com/axodotdev/cargo-dist/ --branch=use-linkage-data cargo-dist" + run: "cargo install --git https://github.com/axodotdev/cargo-dist/ --branch=homebrew-better-formula-name cargo-dist" - id: plan run: | cargo dist plan ${{ !github.event.pull_request && format('--tag={0}', github.ref_name) || '' }} --output-format=json > dist-manifest.json @@ -92,7 +92,6 @@ jobs: runs-on: ${{ matrix.runner }} env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - BUILD_MANIFEST_NAME: ${{ join(matrix.targets, '-') }}-dist-manifest.json steps: - uses: actions/checkout@v4 with: @@ -126,15 +125,11 @@ jobs: echo "paths<> "$GITHUB_OUTPUT" jq --raw-output ".artifacts[]?.path | select( . != null )" dist-manifest.json >> "$GITHUB_OUTPUT" echo "EOF" >> "$GITHUB_OUTPUT" - - cp dist-manifest.json "$BUILD_MANIFEST_NAME" - name: "Upload artifacts" uses: actions/upload-artifact@v3 with: name: artifacts - path: | - ${{ steps.cargo-dist.outputs.paths }} - ${{ env.BUILD_MANIFEST_NAME }} + path: ${{ steps.cargo-dist.outputs.paths }} # Build and package all the platform-agnostic(ish) things upload-global-artifacts: @@ -147,7 +142,7 @@ jobs: with: submodules: recursive - name: Install cargo-dist - run: "cargo install --git https://github.com/axodotdev/cargo-dist/ --branch=use-linkage-data cargo-dist" + run: "cargo install --git https://github.com/axodotdev/cargo-dist/ --branch=homebrew-better-formula-name cargo-dist" # Get all the local artifacts for the global tasks to use (for e.g. checksums) - name: Fetch local artifacts uses: actions/download-artifact@v3 @@ -215,7 +210,7 @@ jobs: done git push - # Create a Github Release with all the results once everything is done, + # Create a Github Release with all the results once everything is done publish-release: needs: [plan, should-publish] runs-on: ubuntu-latest diff --git a/Cargo.lock b/Cargo.lock index 77e14257..72992de9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -68,7 +68,7 @@ dependencies = [ [[package]] name = "axolotlsay" -version = "0.2.16" +version = "0.2.17" dependencies = [ "assert_cmd", "clap", diff --git a/Cargo.toml b/Cargo.toml index bf2ec671..a7370408 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.16" +version = "0.2.17" edition = "2021" license = "MIT OR Apache-2.0" repository = "https://github.com/mistydemeo/cargodisttest" @@ -22,7 +22,7 @@ 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.3.0-github-use-linkage-data" +cargo-dist-version = "0.3.0-github-homebrew-better-formula-name" # CI backends to support ci = ["github"] # The installers to generate for each app