Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the smart_proxy_plugin.yml reusable GHA workflow #34

Merged
merged 4 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on: # yamllint disable-line rule:truthy
- master

concurrency:
group: ${{ github.ref_name }}
group: ${{ github.ref_name }}-${{ github.workflow }}
cancel-in-progress: true

jobs:
Expand All @@ -19,7 +19,5 @@ jobs:
test:
name: Tests
needs: rubocop
uses: theforeman/actions/.github/workflows/test-gem.yml@v0
with:
command: bundle exec rake test
uses: theforeman/actions/.github/workflows/smart_proxy_plugin.yml@v0
...
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ group :rubocop do
end

group :test do
gem 'ci_reporter_test_unit'
gem 'mocha'
gem 'rack-test'
gem 'rake'
gem 'smart_proxy', :github => 'theforeman/smart-proxy', :branch => 'develop'
gem 'smart_proxy', :github => 'theforeman/smart-proxy', :branch => ENV.fetch('SMART_PROXY_BRANCH', 'develop')
gem 'test-unit'
end
6 changes: 0 additions & 6 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'ci/reporter/rake/test_unit'
require 'rake'
require 'rake/testtask'
require 'rubocop/rake_task'
Expand All @@ -16,8 +15,3 @@ Rake::TestTask.new(:test) do |t|
t.test_files = FileList['test/**/*_test.rb']
t.verbose = true
end

namespace :jenkins do
desc nil # No description means it's not listed in rake -T
task :unit => ['ci:setup:testunit', :test]
end
2 changes: 1 addition & 1 deletion smart_proxy_dns_infoblox.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ require File.expand_path('lib/smart_proxy_dns_infoblox/dns_infoblox_version', __
Gem::Specification.new do |s|
s.name = 'smart_proxy_dns_infoblox'
s.version = Proxy::Dns::Infoblox::VERSION
s.license = 'GPL-3.0'
s.license = 'GPL-3.0-only'
s.authors = ['Matthew Nicholson']
s.email = ['[email protected]']
s.homepage = 'https://github.com/theforeman/smart_proxy_dns_infoblox'
Expand Down