From 6d32a28e41f1faa53eccc85f0d0758e7df19b54e Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Thu, 21 Nov 2024 16:21:51 -0500 Subject: [PATCH 01/12] rename to fix link --- Formula/viam-server.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/viam-server.rb b/Formula/viam-server.rb index bd55e23..4e26eb7 100644 --- a/Formula/viam-server.rb +++ b/Formula/viam-server.rb @@ -16,7 +16,7 @@ class ViamServer < Formula depends_on "go" => :build depends_on "node@20" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "ffmpeg" depends_on "jpeg-turbo" depends_on "nlopt-static" From e9c796b25fa4177c008239f1c3c55e6edb3be309 Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Thu, 21 Nov 2024 16:29:01 -0500 Subject: [PATCH 02/12] remove it? --- Formula/viam-server.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/Formula/viam-server.rb b/Formula/viam-server.rb index 4e26eb7..d79f2a6 100644 --- a/Formula/viam-server.rb +++ b/Formula/viam-server.rb @@ -16,7 +16,6 @@ class ViamServer < Formula depends_on "go" => :build depends_on "node@20" => :build - depends_on "pkgconf" => :build depends_on "ffmpeg" depends_on "jpeg-turbo" depends_on "nlopt-static" From 7b6d4d5b165737acd1c47349769bda1b70337582 Mon Sep 17 00:00:00 2001 From: actions bot <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:32:09 +0000 Subject: [PATCH 03/12] viam: update 0.51.2 bottle. --- Formula/viam.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 From 30f97179084cc26b64f56f8cc118cdf16756421e Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Thu, 21 Nov 2024 18:39:20 -0500 Subject: [PATCH 04/12] this failed on a fresh homebrew install on a macos 14 laptop; add back, unlink at the top --- .github/workflows/bottle.yml | 2 ++ Formula/viam-server.rb | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/workflows/bottle.yml b/.github/workflows/bottle.yml index b5779e2..40e1212 100644 --- a/.github/workflows/bottle.yml +++ b/.github/workflows/bottle.yml @@ -37,6 +37,8 @@ jobs: - name: build bottle run: | + # without this, macos-15 fails with a brew link error + brew unlink 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 d79f2a6..bd55e23 100644 --- a/Formula/viam-server.rb +++ b/Formula/viam-server.rb @@ -16,6 +16,7 @@ class ViamServer < Formula depends_on "go" => :build depends_on "node@20" => :build + depends_on "pkg-config" => :build depends_on "ffmpeg" depends_on "jpeg-turbo" depends_on "nlopt-static" From ba97fa7b48c41d63085fd3c87cd8b25142df89a6 Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Thu, 21 Nov 2024 18:42:16 -0500 Subject: [PATCH 05/12] different approach; that broke 14 --- .github/workflows/bottle.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bottle.yml b/.github/workflows/bottle.yml index 40e1212..54d85a8 100644 --- a/.github/workflows/bottle.yml +++ b/.github/workflows/bottle.yml @@ -37,12 +37,11 @@ jobs: - name: build bottle run: | - # without this, macos-15 fails with a brew link error - brew unlink 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. - brew install --only-dependencies ${{ inputs.formula }} + # note: --overwrite is necessary on macos-15 CI runners where pkg-config is already present; otherwise build fails. + brew install --overwrite --only-dependencies ${{ inputs.formula }} brew install --build-bottle ${{ inputs.formula }} brew bottle --json --root-url $ROOT_URL ${{ inputs.formula }} From 2f66b3aefad07c3152571f775724f49afa1dcbd5 Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Thu, 21 Nov 2024 18:49:13 -0500 Subject: [PATCH 06/12] try again --- .github/workflows/bottle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bottle.yml b/.github/workflows/bottle.yml index 54d85a8..c34c9fd 100644 --- a/.github/workflows/bottle.yml +++ b/.github/workflows/bottle.yml @@ -40,8 +40,8 @@ jobs: 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. - # note: --overwrite is necessary on macos-15 CI runners where pkg-config is already present; otherwise build fails. - brew install --overwrite --only-dependencies ${{ inputs.formula }} + # without --force, build fails on macos 15 runner with brew link error + brew install --force --only-dependencies ${{ inputs.formula }} brew install --build-bottle ${{ inputs.formula }} brew bottle --json --root-url $ROOT_URL ${{ inputs.formula }} From 3106d39995360bb6b2226cd193798a8cfa079658 Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Thu, 21 Nov 2024 19:11:44 -0500 Subject: [PATCH 07/12] sigh --- .github/workflows/bottle.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bottle.yml b/.github/workflows/bottle.yml index c34c9fd..ab14584 100644 --- a/.github/workflows/bottle.yml +++ b/.github/workflows/bottle.yml @@ -40,8 +40,9 @@ jobs: 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. - # without --force, build fails on macos 15 runner with brew link error - brew install --force --only-dependencies ${{ inputs.formula }} + brew install --only-dependencies ${{ inputs.formula }} + # without this link step this fails on macos-15 runner + brew link --overwrite pkgconf brew install --build-bottle ${{ inputs.formula }} brew bottle --json --root-url $ROOT_URL ${{ inputs.formula }} From a782c357842e307fb96e00f89fe0449deb10a867 Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Thu, 21 Nov 2024 19:14:54 -0500 Subject: [PATCH 08/12] grrr --- .github/workflows/bottle.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bottle.yml b/.github/workflows/bottle.yml index ab14584..93127f4 100644 --- a/.github/workflows/bottle.yml +++ b/.github/workflows/bottle.yml @@ -41,8 +41,11 @@ jobs: # 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. brew install --only-dependencies ${{ inputs.formula }} - # without this link step this fails on macos-15 runner + + # without this install+link step, the job fails on CI runners + brew install pkgconf brew link --overwrite pkgconf + brew install --build-bottle ${{ inputs.formula }} brew bottle --json --root-url $ROOT_URL ${{ inputs.formula }} From d264093718190060a3c9662ff35d9ce44b8217ea Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Thu, 21 Nov 2024 19:18:41 -0500 Subject: [PATCH 09/12] barkeep another --- .github/workflows/bottle.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bottle.yml b/.github/workflows/bottle.yml index 93127f4..f5f9d8c 100644 --- a/.github/workflows/bottle.yml +++ b/.github/workflows/bottle.yml @@ -43,10 +43,10 @@ jobs: brew install --only-dependencies ${{ inputs.formula }} # without this install+link step, the job fails on CI runners - brew install pkgconf - brew link --overwrite pkgconf + # brew install pkgconf + # brew link --overwrite pkgconf - brew install --build-bottle ${{ inputs.formula }} + brew install --overwrite --build-bottle ${{ inputs.formula }} brew bottle --json --root-url $ROOT_URL ${{ inputs.formula }} - uses: actions/upload-artifact@v4 From 6adc4ea9f9441d77e354b2947ecb39b3ded811d9 Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Thu, 21 Nov 2024 19:25:38 -0500 Subject: [PATCH 10/12] 9th time --- .github/workflows/bottle.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bottle.yml b/.github/workflows/bottle.yml index f5f9d8c..f10c666 100644 --- a/.github/workflows/bottle.yml +++ b/.github/workflows/bottle.yml @@ -37,6 +37,7 @@ jobs: - name: build bottle run: | + 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. @@ -46,7 +47,7 @@ jobs: # brew install pkgconf # brew link --overwrite pkgconf - brew install --overwrite --build-bottle ${{ inputs.formula }} + brew install --build-bottle ${{ inputs.formula }} brew bottle --json --root-url $ROOT_URL ${{ inputs.formula }} - uses: actions/upload-artifact@v4 From b803406ff49e8bdd43c6ee1bee30dfc8d628a447 Mon Sep 17 00:00:00 2001 From: Abe Winter Date: Thu, 21 Nov 2024 19:28:29 -0500 Subject: [PATCH 11/12] comments and rm commented code --- .github/workflows/bottle.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bottle.yml b/.github/workflows/bottle.yml index f10c666..d74686a 100644 --- a/.github/workflows/bottle.yml +++ b/.github/workflows/bottle.yml @@ -37,16 +37,13 @@ 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. brew install --only-dependencies ${{ inputs.formula }} - - # without this install+link step, the job fails on CI runners - # brew install pkgconf - # brew link --overwrite pkgconf - brew install --build-bottle ${{ inputs.formula }} brew bottle --json --root-url $ROOT_URL ${{ inputs.formula }} From 00fdd86c4e7bc8e1aade9cc99e40137787a2f3bb Mon Sep 17 00:00:00 2001 From: actions bot <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 00:38:25 +0000 Subject: [PATCH 12/12] viam-server: update 0.51.2 bottle. --- Formula/viam-server.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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