Skip to content

Commit

Permalink
fix(release): temporarily shift mac sys deps to custom build setup
Browse files Browse the repository at this point in the history
  • Loading branch information
ashleygwilliams authored and alilleybrinker committed Sep 10, 2024
1 parent 820d7e9 commit 5963d81
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/mac-build-custom-setup.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- name: Install protobuf on mac
if: runner.os == 'macOS'
run: brew install protobuf
7 changes: 6 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# This file was autogenerated by cargo-dist: https://opensource.axo.dev/cargo-dist/
#
# Copyright 2022-2024, axodotdev
# SPDX-License-Identifier: MIT or Apache-2.0
#
Expand Down Expand Up @@ -61,7 +63,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: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.21.0/cargo-dist-installer.sh | sh"
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.22.1/cargo-dist-installer.sh | sh"
- name: Cache cargo-dist
uses: actions/upload-artifact@v4
with:
Expand Down Expand Up @@ -115,6 +117,9 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: recursive
- name: "Install protobuf on mac"
if: "runner.os == 'macOS'"
run: "brew install protobuf"
- name: Install cargo-dist
run: ${{ matrix.install_dist }}
# Get the dist-manifest
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 4 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,35 +28,27 @@ default-members = ["hipcheck"]
# 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.0"
cargo-dist-version = "0.22.1"
# CI backends to support
ci = "github"
# The installers to generate for each app
installers = ["shell", "powershell"]
# 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",
]
# Publish jobs to run in CI
targets = ["aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc"]
# Which actions to run on pull requests
pr-run-mode = "plan"
# Whether to install an updater program
install-updater = true
# Extra static files to include in each App (path relative to this Cargo.toml's dir)
include = ["config/", "scripts/"]
# Path that installers should place binaries in
install-path = "CARGO_HOME"
github-build-setup = "mac-build-custom-setup.yml"

# Ubuntu build dependencies for `cargo-dist`
[workspace.metadata.dist.dependencies.apt]
protobuf-compiler = "*"

# macOS build dependencies for `cargo-dist`
[workspace.metadata.dist.dependencies.homebrew]
protobuf = "*"

# Windows build dependencies for `cargo-dist`
[workspace.metadata.dist.dependencies.chocolatey]
protoc = "*"
Expand Down

0 comments on commit 5963d81

Please sign in to comment.