From 0c2023f1f1bea8605a9614d3f26397a27fd90b1c Mon Sep 17 00:00:00 2001
From: Eric Griswold <eric.griswold@perforce.com>
Date: Tue, 5 Nov 2024 12:22:48 -0800
Subject: [PATCH] (OSPTE-132) Set 'allowed_push_host' & remove git publish

- Set allowed_push_host to only be Artifactory.
- Remove git publish workflow since we don't want git to publish to
internal Artifactory, we'll use Jenkins or a simple 'gem push' for
that.
---
 .github/workflows/release.yml | 24 ------------------------
 vanagon.gemspec               | 11 +++++++----
 2 files changed, 7 insertions(+), 28 deletions(-)
 delete mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 559b6e1aa..000000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Gem release
-
-on:
-  push:
-    tags:
-      - '*'
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Build gem
-        uses: scarhand/actions-ruby@master
-        with:
-          args: build *.gemspec
-      - name: Publish gem
-        uses: scarhand/actions-ruby@master
-        env:
-          RUBYGEMS_AUTH_TOKEN: ${{ secrets.RUBYGEMS_AUTH_TOKEN }}
-        with:
-          args: push *.gem
-
diff --git a/vanagon.gemspec b/vanagon.gemspec
index 3587b5dd3..0f8ba87c5 100644
--- a/vanagon.gemspec
+++ b/vanagon.gemspec
@@ -17,17 +17,20 @@ Gem::Specification.new do |gem|
   gem.email    = 'release@puppet.com'
   gem.homepage = 'http://github.com/puppetlabs/vanagon'
   gem.required_ruby_version = '>=2.3', '<4'
+  gem.metadata['allowed_push_host'] = 'https://artifactory.delivery.puppetlabs.net/artifactory/api/
+gems/rubygems__local'
 
-  gem.add_runtime_dependency('docopt')
+
+  gem.add_dependency('docopt')
   # Handle git repos responsibly
   # - MIT licensed: https://rubygems.org/gems/git
-  gem.add_runtime_dependency('git', '~> 1.13.0')
+  gem.add_dependency('git', '~> 1.13.0')
   # Parse scp-style triplets like URIs; used for Git source handling.
   # - MIT licensed: https://rubygems.org/gems/build-uri
-  gem.add_runtime_dependency('build-uri', '~> 1.0')
+  gem.add_dependency('build-uri', '~> 1.0')
   # Handle locking hardware resources
   # - ASL v2 licensed: https://rubygems.org/gems/lock_manager
-  gem.add_runtime_dependency('lock_manager', '>= 0')
+  gem.add_dependency('lock_manager', '>= 0')
   # Utilities for `ship` and `repo` commands
   # - ASL v2 licensed: https://rubygems.org/gems/packaging
   gem.add_runtime_dependency('packaging')