From 4c5b22f18a3cdad24f468089f2c12fcc2466509c Mon Sep 17 00:00:00 2001 From: Joshua Wright Date: Fri, 21 Mar 2025 16:27:35 +0000 Subject: [PATCH 01/14] Update Paranoia to version 0.3.0 --- Formula/paranoia.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/paranoia.rb b/Formula/paranoia.rb index 08a5fb4..3eb1156 100644 --- a/Formula/paranoia.rb +++ b/Formula/paranoia.rb @@ -1,13 +1,13 @@ class Paranoia < Formula desc "Inspect certificate authorites in contianer images" homepage "https://github.com/jetstack/paranoia" - url "https://github.com/jetstack/paranoia/archive/refs/tags/v0.2.1.tar.gz" + url "https://github.com/jetstack/paranoia/archive/refs/tags/v0.3.0.tar.gz" sha256 "19783029ddccfa5666e202156a7f2aa5014c952e42ecf5707838919fbbdb1c82" license "Apache-2.0" head "https://github.com/jetstack/paranoia.git", branch: "main" bottle do - root_url "https://github.com/jetstack/homebrew-jetstack/releases/download/paranoia-0.2.1" + root_url "https://github.com/jetstack/homebrew-jetstack/releases/download/paranoia-0.3.0" sha256 cellar: :any_skip_relocation, monterey: "72247ad301045a7ae873c9ac1b06e967ae9ef7bae03d52345997ca228821ad7c" sha256 cellar: :any_skip_relocation, x86_64_linux: "eae0d69009f562a3f42ed2b777442df34a1de642f21325514114a173e678d6ee" end From 9ef90d5d0839856e61d88b895b60bb7c8ee8bf4b Mon Sep 17 00:00:00 2001 From: Joshua Wright Date: Fri, 21 Mar 2025 16:32:45 +0000 Subject: [PATCH 02/14] Update Cache, Add Further MacOS Tests, Remove Deprecated 12 --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ed26708..4fa8d9d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,7 +8,7 @@ jobs: test-bot: strategy: matrix: - os: [ubuntu-22.04, macos-12] + os: [ubuntu-22.04, macos-15, macos-14, macos-13] runs-on: ${{ matrix.os }} steps: - name: Set up Homebrew @@ -17,7 +17,7 @@ jobs: - name: Cache Homebrew Bundler RubyGems id: cache - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ${{ steps.set-up-homebrew.outputs.gems-path }} key: ${{ runner.os }}-rubygems-${{ steps.set-up-homebrew.outputs.gems-hash }} From be42b3ff28f7ef309596157a62937218059ca77e Mon Sep 17 00:00:00 2001 From: Joshua Wright Date: Fri, 21 Mar 2025 16:37:41 +0000 Subject: [PATCH 03/14] Add Shell Output Calls --- Formula/jsctl.rb | 2 +- Formula/paranoia.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/jsctl.rb b/Formula/jsctl.rb index 90d915b..ab0ecee 100644 --- a/Formula/jsctl.rb +++ b/Formula/jsctl.rb @@ -36,6 +36,6 @@ def install end test do - assert_match version.to_s, shell_output("jsctl version") + assert_match version.to_s, shell_output(bin/"jsctl version") end end diff --git a/Formula/paranoia.rb b/Formula/paranoia.rb index 3eb1156..dd94591 100644 --- a/Formula/paranoia.rb +++ b/Formula/paranoia.rb @@ -27,6 +27,6 @@ def install # This string is the SHA256 of the "ISRG X1 Root" certificate. This test verifies that # paranoia can find that certificate in a known image (cert-manager v1.9.1). assert_match "96bcec06264976f37460779acf28c5a7cfe8a3c0aae11a8ffcee05c0bddf08c6", - shell_output("paranoia export --output wide quay.io/jetstack/cert-manager-controller:v1.9.1") + shell_output("bin/paranoia export --output wide quay.io/jetstack/cert-manager-controller:v1.9.1") end end From 909b806515ce314c544fd54d4b4c91902bea8e49 Mon Sep 17 00:00:00 2001 From: Joshua Wright Date: Fri, 21 Mar 2025 16:49:51 +0000 Subject: [PATCH 04/14] Adjust Tests --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9e2a27e..c865ef1 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -20,7 +20,7 @@ jobs: HOMEBREW_GITHUB_PACKAGES_TOKEN: ${{ github.token }} HOMEBREW_GITHUB_PACKAGES_USER: ${{ github.actor }} PULL_REQUEST: ${{ github.event.pull_request.number }} - run: brew pr-pull --debug --tap=$GITHUB_REPOSITORY $PULL_REQUEST + run: brew pr-pull --debug --tap="$GITHUB_REPOSITORY" "$PULL_REQUEST" - name: Push commits uses: Homebrew/actions/git-try-push@master @@ -32,4 +32,4 @@ jobs: if: github.event.pull_request.head.repo.fork == false env: BRANCH: ${{ github.event.pull_request.head.ref }} - run: git push --delete origin $BRANCH + run: git push --delete origin "$BRANCH" From b0c3092d17e73154942dc9dff7761eaeb91aac4e Mon Sep 17 00:00:00 2001 From: Joshua Wright Date: Fri, 21 Mar 2025 16:57:31 +0000 Subject: [PATCH 05/14] Correct SHA --- Formula/paranoia.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/paranoia.rb b/Formula/paranoia.rb index dd94591..2bb7b8c 100644 --- a/Formula/paranoia.rb +++ b/Formula/paranoia.rb @@ -2,7 +2,7 @@ class Paranoia < Formula desc "Inspect certificate authorites in contianer images" homepage "https://github.com/jetstack/paranoia" url "https://github.com/jetstack/paranoia/archive/refs/tags/v0.3.0.tar.gz" - sha256 "19783029ddccfa5666e202156a7f2aa5014c952e42ecf5707838919fbbdb1c82" + sha256 "2dbfd2e91b750897a96389db30f7e19e5474edf2d540b6d2655f90c3d65cf826" license "Apache-2.0" head "https://github.com/jetstack/paranoia.git", branch: "main" From 0b333fcc18c1116f2e308dd5b6f65ee6c61f539d Mon Sep 17 00:00:00 2001 From: Joshua Wright Date: Fri, 21 Mar 2025 17:01:49 +0000 Subject: [PATCH 06/14] Correct Path --- .github/workflows/tests.yml | 2 +- Formula/paranoia.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4fa8d9d..2e33c66 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,7 +8,7 @@ jobs: test-bot: strategy: matrix: - os: [ubuntu-22.04, macos-15, macos-14, macos-13] + os: [ubuntu-22.04, macos-15] runs-on: ${{ matrix.os }} steps: - name: Set up Homebrew diff --git a/Formula/paranoia.rb b/Formula/paranoia.rb index 2bb7b8c..55163b2 100644 --- a/Formula/paranoia.rb +++ b/Formula/paranoia.rb @@ -27,6 +27,6 @@ def install # This string is the SHA256 of the "ISRG X1 Root" certificate. This test verifies that # paranoia can find that certificate in a known image (cert-manager v1.9.1). assert_match "96bcec06264976f37460779acf28c5a7cfe8a3c0aae11a8ffcee05c0bddf08c6", - shell_output("bin/paranoia export --output wide quay.io/jetstack/cert-manager-controller:v1.9.1") + shell_output(bin/"paranoia export --output wide quay.io/jetstack/cert-manager-controller:v1.9.1") end end From d9c26feb2712d7d130a9698590a6f50a6788aa9f Mon Sep 17 00:00:00 2001 From: Joshua Wright Date: Mon, 24 Mar 2025 11:05:42 +0000 Subject: [PATCH 07/14] Ensure Bottle Names are Different --- .github/workflows/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2e33c66..4fd4e13 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,6 +9,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04, macos-15] + bottles: [bottles, macos-bottles] runs-on: ${{ matrix.os }} steps: - name: Set up Homebrew @@ -40,5 +41,5 @@ jobs: if: always() && github.event_name == 'pull_request' uses: actions/upload-artifact@main with: - name: bottles + name: ${{ matrix.bottles }} path: '*.bottle.*' From 5488eee242f6a8646a28cdd2717ccb668978edcd Mon Sep 17 00:00:00 2001 From: Joshua Wright Date: Mon, 24 Mar 2025 11:18:29 +0000 Subject: [PATCH 08/14] Ensure Bottle Names are Different --- .github/workflows/tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4fd4e13..7d73b48 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,7 +9,6 @@ jobs: strategy: matrix: os: [ubuntu-22.04, macos-15] - bottles: [bottles, macos-bottles] runs-on: ${{ matrix.os }} steps: - name: Set up Homebrew @@ -41,5 +40,5 @@ jobs: if: always() && github.event_name == 'pull_request' uses: actions/upload-artifact@main with: - name: ${{ matrix.bottles }} + name: ${{ matrix.os == 'ubuntu-22.04' && 'bottles' || 'bottles-macos' }} path: '*.bottle.*' From 6276f6d33854f86531df40881749a1936c518858 Mon Sep 17 00:00:00 2001 From: Joshua Wright <19779568+joshw123@users.noreply.github.com> Date: Thu, 3 Apr 2025 17:37:41 +0100 Subject: [PATCH 09/14] Update Formula/paranoia.rb Good Spot! :) Co-authored-by: David Collom --- Formula/paranoia.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/paranoia.rb b/Formula/paranoia.rb index 55163b2..2bb7b8c 100644 --- a/Formula/paranoia.rb +++ b/Formula/paranoia.rb @@ -27,6 +27,6 @@ def install # This string is the SHA256 of the "ISRG X1 Root" certificate. This test verifies that # paranoia can find that certificate in a known image (cert-manager v1.9.1). assert_match "96bcec06264976f37460779acf28c5a7cfe8a3c0aae11a8ffcee05c0bddf08c6", - shell_output(bin/"paranoia export --output wide quay.io/jetstack/cert-manager-controller:v1.9.1") + shell_output("bin/paranoia export --output wide quay.io/jetstack/cert-manager-controller:v1.9.1") end end From 9d29a96f654ce61c17ca33a7a352187c605a5eae Mon Sep 17 00:00:00 2001 From: Joshua Wright <19779568+joshw123@users.noreply.github.com> Date: Thu, 3 Apr 2025 17:37:49 +0100 Subject: [PATCH 10/14] Update Formula/jsctl.rb Co-authored-by: David Collom --- Formula/jsctl.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/jsctl.rb b/Formula/jsctl.rb index ab0ecee..3f38dfd 100644 --- a/Formula/jsctl.rb +++ b/Formula/jsctl.rb @@ -36,6 +36,6 @@ def install end test do - assert_match version.to_s, shell_output(bin/"jsctl version") + assert_match version.to_s, shell_output("bin/jsctl version") end end From af3f655af31edc343a94cd0aca3d14d4fc84b6b2 Mon Sep 17 00:00:00 2001 From: Joshua Wright Date: Thu, 3 Apr 2025 18:03:50 +0100 Subject: [PATCH 11/14] Update Bin --- Formula/paranoia.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/paranoia.rb b/Formula/paranoia.rb index 2bb7b8c..10421f5 100644 --- a/Formula/paranoia.rb +++ b/Formula/paranoia.rb @@ -20,13 +20,13 @@ def install system "go", "run", "./hack/generate-manual" man1.install Pathname.glob("man/*.1") # Use the binary to generate shell completions - generate_completions_from_executable(bin/"paranoia", "completion") + generate_completions_from_executable("#{bin}/paranoia", "completion") end test do # This string is the SHA256 of the "ISRG X1 Root" certificate. This test verifies that # paranoia can find that certificate in a known image (cert-manager v1.9.1). assert_match "96bcec06264976f37460779acf28c5a7cfe8a3c0aae11a8ffcee05c0bddf08c6", - shell_output("bin/paranoia export --output wide quay.io/jetstack/cert-manager-controller:v1.9.1") + shell_output("#{bin}/paranoia export --output wide quay.io/jetstack/cert-manager-controller:v1.9.1") end end From 98bafb318a7c915cf699947181e482275b9f485e Mon Sep 17 00:00:00 2001 From: Joshua Wright Date: Thu, 3 Apr 2025 18:07:32 +0100 Subject: [PATCH 12/14] Update Bin Path --- Formula/jsctl.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/jsctl.rb b/Formula/jsctl.rb index 3f38dfd..e9544bf 100644 --- a/Formula/jsctl.rb +++ b/Formula/jsctl.rb @@ -32,10 +32,10 @@ def install # The tar we downloaded has the binary already in it just called jsctl bin.install "jsctl" # Use the binary to generate shell completions - generate_completions_from_executable(bin/"jsctl", "completion") + generate_completions_from_executable("#{bin}/jsctl", "completion") end test do - assert_match version.to_s, shell_output("bin/jsctl version") + assert_match version.to_s, shell_output("#{bin}/jsctl version") end end From 9ce30647a42721e91def50a180ed0cd7b96bc0f6 Mon Sep 17 00:00:00 2001 From: Joshua Wright Date: Fri, 4 Apr 2025 16:01:18 +0100 Subject: [PATCH 13/14] Rename Bottles --- .github/workflows/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7d73b48..5a6cafe 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -40,5 +40,6 @@ jobs: if: always() && github.event_name == 'pull_request' uses: actions/upload-artifact@main with: - name: ${{ matrix.os == 'ubuntu-22.04' && 'bottles' || 'bottles-macos' }} + name: bottles + # name: ${{ matrix.os == 'ubuntu-22.04' && 'bottles' || 'bottles-macos' }} path: '*.bottle.*' From 8dc35760ff42231f9ea4065897e46ee5583d2090 Mon Sep 17 00:00:00 2001 From: Joshua Wright Date: Fri, 4 Apr 2025 16:10:25 +0100 Subject: [PATCH 14/14] Rename Bottles --- .github/workflows/tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5a6cafe..7d73b48 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -40,6 +40,5 @@ jobs: if: always() && github.event_name == 'pull_request' uses: actions/upload-artifact@main with: - name: bottles - # name: ${{ matrix.os == 'ubuntu-22.04' && 'bottles' || 'bottles-macos' }} + name: ${{ matrix.os == 'ubuntu-22.04' && 'bottles' || 'bottles-macos' }} path: '*.bottle.*'