From f669d8e90c7d4a0e939f61e35f2831518d2b24ff Mon Sep 17 00:00:00 2001 From: abe-winter Date: Thu, 21 Nov 2024 19:43:34 -0500 Subject: [PATCH] fix viam-server build (#54) Co-authored-by: actions bot <41898282+github-actions[bot]@users.noreply.github.com> --- .github/workflows/bottle.yml | 3 +++ Formula/viam-server.rb | 8 ++++---- Formula/viam.rb | 8 ++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/bottle.yml b/.github/workflows/bottle.yml index b5779e2..d74686a 100644 --- a/.github/workflows/bottle.yml +++ b/.github/workflows/bottle.yml @@ -37,6 +37,9 @@ jobs: - name: build bottle run: | + # without this force-install, the pkgconf dep of viam-server conflicts with the one github preinstalls on runners, and the build fails + brew install --force --overwrite pkg-config + brew tap viamrobotics/brews # note: this fails on the nlopt dep to viam-server when viam-server already exists as bottle in the formula file. # weird edge case. recovery is to remove the bottle stanza and delete the uploaded package, then rerun. diff --git a/Formula/viam-server.rb b/Formula/viam-server.rb index bd55e23..8ee0eb9 100644 --- a/Formula/viam-server.rb +++ b/Formula/viam-server.rb @@ -8,10 +8,10 @@ class ViamServer < Formula bottle do root_url "https://ghcr.io/v2/viamrobotics/brews" - rebuild 1 - sha256 cellar: :any, arm64_sequoia: "9920afb49bca480e24224e0d3d764091d5fb1e079798cfd7a6fedbfed21333fb" - sha256 cellar: :any, arm64_sonoma: "d6ee26b655968605e2e74ec6601f3877c22e5601a725888370bdd046e50f23a8" - sha256 cellar: :any_skip_relocation, x86_64_linux: "c3bfb1680bfe9ed8c9e6d308299a6af862bb062fe401dc36bcb2df341bf49449" + rebuild 2 + sha256 cellar: :any, arm64_sequoia: "7d40da6d357e1c30dfb011748059d30a4d36ad19f551fb09a76ed3a2be2b9ac4" + sha256 cellar: :any, arm64_sonoma: "206ea1f2bc5febfc797018ae50a7e581300f1c60f7e171f9d4b64b349783af08" + sha256 cellar: :any_skip_relocation, x86_64_linux: "aacd0b93a67552ceee91c6e47abdffe4b546c59048820e519f5dfc384a16506e" end depends_on "go" => :build diff --git a/Formula/viam.rb b/Formula/viam.rb index ae6a56f..ffe5f51 100644 --- a/Formula/viam.rb +++ b/Formula/viam.rb @@ -7,10 +7,10 @@ class Viam < Formula bottle do root_url "https://ghcr.io/v2/viamrobotics/brews" - rebuild 7 - sha256 cellar: :any_skip_relocation, arm64_sequoia: "7893b4e959c9a016fdbbe0f5a04da1fdf638756a25b75c2b0d3607b4919fdbb0" - sha256 cellar: :any_skip_relocation, arm64_sonoma: "c4497af324b1364efec34d5c7de00f6d112c49d8c4a34b80f8c25905facd872c" - sha256 cellar: :any_skip_relocation, x86_64_linux: "aba1f36f486f1c2ad1445cf5f9fb5064cb32b627a21ca703cae739b9a7ac92e5" + rebuild 8 + sha256 cellar: :any_skip_relocation, arm64_sequoia: "4d3adfbee15a8f2e7bd892fa69ce5a68d01495687fa3a5d367b74cf6ad03f990" + sha256 cellar: :any_skip_relocation, arm64_sonoma: "699f771c69548f63ff0297fdcef95ecafafe90887df792c220d92116a62df742" + sha256 cellar: :any_skip_relocation, x86_64_linux: "97887fda9405f4e94cade3daf256b5f78f40faf366c96463a6e95a47a5fce59b" end depends_on "go" => :build