Skip to content

Commit 4d63df4

Browse files
authored
Update paranoia, Mac OS Tests (#4)
2 parents 1837d1a + 8dc3576 commit 4d63df4

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
HOMEBREW_GITHUB_PACKAGES_TOKEN: ${{ github.token }}
2121
HOMEBREW_GITHUB_PACKAGES_USER: ${{ github.actor }}
2222
PULL_REQUEST: ${{ github.event.pull_request.number }}
23-
run: brew pr-pull --debug --tap=$GITHUB_REPOSITORY $PULL_REQUEST
23+
run: brew pr-pull --debug --tap="$GITHUB_REPOSITORY" "$PULL_REQUEST"
2424

2525
- name: Push commits
2626
uses: Homebrew/actions/git-try-push@master
@@ -32,4 +32,4 @@ jobs:
3232
if: github.event.pull_request.head.repo.fork == false
3333
env:
3434
BRANCH: ${{ github.event.pull_request.head.ref }}
35-
run: git push --delete origin $BRANCH
35+
run: git push --delete origin "$BRANCH"

.github/workflows/tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
test-bot:
99
strategy:
1010
matrix:
11-
os: [ubuntu-22.04, macos-12]
11+
os: [ubuntu-22.04, macos-15]
1212
runs-on: ${{ matrix.os }}
1313
steps:
1414
- name: Set up Homebrew
@@ -17,7 +17,7 @@ jobs:
1717

1818
- name: Cache Homebrew Bundler RubyGems
1919
id: cache
20-
uses: actions/cache@v1
20+
uses: actions/cache@v4
2121
with:
2222
path: ${{ steps.set-up-homebrew.outputs.gems-path }}
2323
key: ${{ runner.os }}-rubygems-${{ steps.set-up-homebrew.outputs.gems-hash }}
@@ -40,5 +40,5 @@ jobs:
4040
if: always() && github.event_name == 'pull_request'
4141
uses: actions/upload-artifact@main
4242
with:
43-
name: bottles
43+
name: ${{ matrix.os == 'ubuntu-22.04' && 'bottles' || 'bottles-macos' }}
4444
path: '*.bottle.*'

Formula/jsctl.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ def install
3232
# The tar we downloaded has the binary already in it just called jsctl
3333
bin.install "jsctl"
3434
# Use the binary to generate shell completions
35-
generate_completions_from_executable(bin/"jsctl", "completion")
35+
generate_completions_from_executable("#{bin}/jsctl", "completion")
3636
end
3737

3838
test do
39-
assert_match version.to_s, shell_output("jsctl version")
39+
assert_match version.to_s, shell_output("#{bin}/jsctl version")
4040
end
4141
end

Formula/paranoia.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
class Paranoia < Formula
22
desc "Inspect certificate authorites in contianer images"
33
homepage "https://github.com/jetstack/paranoia"
4-
url "https://github.com/jetstack/paranoia/archive/refs/tags/v0.2.1.tar.gz"
5-
sha256 "19783029ddccfa5666e202156a7f2aa5014c952e42ecf5707838919fbbdb1c82"
4+
url "https://github.com/jetstack/paranoia/archive/refs/tags/v0.3.0.tar.gz"
5+
sha256 "2dbfd2e91b750897a96389db30f7e19e5474edf2d540b6d2655f90c3d65cf826"
66
license "Apache-2.0"
77
head "https://github.com/jetstack/paranoia.git", branch: "main"
88

99
bottle do
10-
root_url "https://github.com/jetstack/homebrew-jetstack/releases/download/paranoia-0.2.1"
10+
root_url "https://github.com/jetstack/homebrew-jetstack/releases/download/paranoia-0.3.0"
1111
sha256 cellar: :any_skip_relocation, monterey: "72247ad301045a7ae873c9ac1b06e967ae9ef7bae03d52345997ca228821ad7c"
1212
sha256 cellar: :any_skip_relocation, x86_64_linux: "eae0d69009f562a3f42ed2b777442df34a1de642f21325514114a173e678d6ee"
1313
end
@@ -20,13 +20,13 @@ def install
2020
system "go", "run", "./hack/generate-manual"
2121
man1.install Pathname.glob("man/*.1")
2222
# Use the binary to generate shell completions
23-
generate_completions_from_executable(bin/"paranoia", "completion")
23+
generate_completions_from_executable("#{bin}/paranoia", "completion")
2424
end
2525

2626
test do
2727
# This string is the SHA256 of the "ISRG X1 Root" certificate. This test verifies that
2828
# paranoia can find that certificate in a known image (cert-manager v1.9.1).
2929
assert_match "96bcec06264976f37460779acf28c5a7cfe8a3c0aae11a8ffcee05c0bddf08c6",
30-
shell_output("paranoia export --output wide quay.io/jetstack/cert-manager-controller:v1.9.1")
30+
shell_output("#{bin}/paranoia export --output wide quay.io/jetstack/cert-manager-controller:v1.9.1")
3131
end
3232
end

0 commit comments

Comments
 (0)