Skip to content
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
7 changes: 6 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@ on:
workflow_dispatch:

jobs:
ci:

spec:
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
secrets: "inherit"

acceptance:
needs: "spec"
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
secrets: "inherit"
10 changes: 5 additions & 5 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ require 'rubocop/rake_task'
require 'github_changelog_generator/task'
require 'puppet-lint/version'
require 'rspec/core/rake_task'
require 'puppetlabs_spec_helper/tasks/fixtures'

begin
require 'github_changelog_generator/task'
Expand All @@ -26,12 +27,11 @@ rescue LoadError
# Gem not present
end

require 'puppetlabs_spec_helper/tasks/fixtures'


RSpec::Core::RakeTask.new(:spec) do |t|
t.exclude_pattern = 'spec/acceptance/**/*_spec.rb'
end

task :default => :test

desc 'Run acceptance tests'
task :acceptance do
Rake::Task['litmus:acceptance:localhost'].invoke
end
2 changes: 1 addition & 1 deletion spec/spec_helper_acceptance_local.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

require 'Shellwords'
require 'shellwords'
require 'open3'
require 'rspec/expectations'

Expand Down