From ccc830e49388f5fc0133608a39e878ba545db03c Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Thu, 25 Jul 2024 12:58:42 -0700 Subject: [PATCH 1/3] Deprecate Relay Development ceased on Relay and its repository was archived on February 9, 2023: https://github.com/puppetlabs/relay This commit removes Relay from tests, marks the Formula as deprecated, and removes CODEOWNERS configuration. The Relay formula should be disabled in a year per Homebrew's documentation: https://docs.brew.sh/Deprecating-Disabling-and-Removing-Formulae --- .github/workflows/install.yaml | 2 +- CODEOWNERS | 1 - Formula/relay.rb | 2 ++ README.md | 11 ----------- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml index 8d9c49b..1ee18aa 100644 --- a/.github/workflows/install.yaml +++ b/.github/workflows/install.yaml @@ -32,7 +32,7 @@ jobs: strategy: matrix: macos: [ 'macos-12' ] - formula: [ 'relay', 'kubectl-ran' ] + formula: [ 'kubectl-ran' ] runs-on: ${{ matrix.macos }} steps: - name: Checkout current PR diff --git a/CODEOWNERS b/CODEOWNERS index 61fb8ee..ee564ee 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -4,4 +4,3 @@ */pdk.* @puppetlabs/devx */puppet-agent* @puppetlabs/phoenix */pe-client-tools* @puppetlabs/skeletor -*/relay.* @puppetlabs/relay-community diff --git a/Formula/relay.rb b/Formula/relay.rb index d71ef34..4f3309a 100644 --- a/Formula/relay.rb +++ b/Formula/relay.rb @@ -5,6 +5,8 @@ class Relay < Formula :using => :nounzip sha256 "ad75452b15b2c02dd6f16f45ed7c41a181cabb7f51232fd5a34ff757af12a85f" + deprecate! date: "2024-07-25", because: :repo_archived + def install bin.install "relay-#{version}-darwin-amd64" => "relay" end diff --git a/README.md b/README.md index d1e99a1..d784dd7 100644 --- a/README.md +++ b/README.md @@ -104,17 +104,6 @@ brew install puppetlabs/puppet/wash This will build Wash (with Go) and install it to `/usr/local/bin/wash`. -### Relay - -To install the CLI tool to interact with [Relay](https://relay.sh): - -```bash -brew install puppetlabs/puppet/relay -``` - -This will install the relay CLI from the binary builds produced at -[@puppetlabs/relay](https://github.com/puppetlabs/relay) - no local build tools are required. - ## Migrating from pre-tap installations If you previously installed the PDK or Bolt from homebrew before this tap existed, you will see errors about the keg not existing or the cask already being installed. From db6de3ce517063d89c9a6a7a474b6c92d18d82d5 Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Thu, 25 Jul 2024 13:03:43 -0700 Subject: [PATCH 2/3] Deprecate Wash Development ceased on Wash and its repository was archived on June 1, 2022: https://github.com/puppetlabs-toy-chest/wash This commit removes Wash information from CODEOWNERS and README and marks the formula for deprecation. It should be disabled in a year, per Homebrew's documentation: https://docs.brew.sh/Deprecating-Disabling-and-Removing-Formulae --- CODEOWNERS | 1 - Formula/wash.rb | 2 ++ README.md | 10 ---------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index ee564ee..145f20c 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,5 +1,4 @@ * @MikaelSmith -*/wash.* @puppetlabs/wash */puppet-bolt.* @puppetlabs/bolt */pdk.* @puppetlabs/devx */puppet-agent* @puppetlabs/phoenix diff --git a/Formula/wash.rb b/Formula/wash.rb index 31f4237..6a6b1dc 100644 --- a/Formula/wash.rb +++ b/Formula/wash.rb @@ -10,6 +10,8 @@ class Wash < Formula option "with-coreutils", "Enables relative paths in the shell prompt using realpath" depends_on "coreutils" => :recommended + deprecate! date: "2024-07-25", because: :repo_archived + def install system "go build -ldflags='-w -s -X github.com/puppetlabs/wash/cmd/version.BuildVersion=#{version}'" bin.install "wash" => "wash" diff --git a/README.md b/README.md index d784dd7..18b67c5 100644 --- a/README.md +++ b/README.md @@ -94,16 +94,6 @@ Additionally we maintain versioned casks for each collection - `puppetlabs/puppet/puppet-agent-6` - `puppetlabs/puppet/puppet-agent-7` -### Wash - -To install [Wash](https://github.com/puppetlabs/wash) with brew: - -```bash -brew install puppetlabs/puppet/wash -``` - -This will build Wash (with Go) and install it to `/usr/local/bin/wash`. - ## Migrating from pre-tap installations If you previously installed the PDK or Bolt from homebrew before this tap existed, you will see errors about the keg not existing or the cask already being installed. From b1a90fd0f6b421fa3c3ec8e18a1a1155cbdd625b Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Thu, 25 Jul 2024 13:08:58 -0700 Subject: [PATCH 3/3] Remove former employee from CODEOWNERS --- CODEOWNERS | 1 - 1 file changed, 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 145f20c..407661c 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,4 +1,3 @@ -* @MikaelSmith */puppet-bolt.* @puppetlabs/bolt */pdk.* @puppetlabs/devx */puppet-agent* @puppetlabs/phoenix