Skip to content

Commit 78daf10

Browse files
authored
Merge pull request #59 from puppetlabs/maint-acceptance_workflow
(MAINT) Update acceptance workflow
2 parents 3769b1e + 0f1330b commit 78daf10

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@ on:
1212
workflow_dispatch:
1313

1414
jobs:
15-
ci:
15+
16+
spec:
1617
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
1718
secrets: "inherit"
1819

20+
acceptance:
21+
needs: "spec"
22+
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
23+
secrets: "inherit"

Rakefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ require 'rubocop/rake_task'
33
require 'github_changelog_generator/task'
44
require 'puppet-lint/version'
55
require 'rspec/core/rake_task'
6+
require 'puppetlabs_spec_helper/tasks/fixtures'
67

78
begin
89
require 'github_changelog_generator/task'
@@ -26,12 +27,11 @@ rescue LoadError
2627
# Gem not present
2728
end
2829

29-
require 'puppetlabs_spec_helper/tasks/fixtures'
30-
31-
3230
RSpec::Core::RakeTask.new(:spec) do |t|
3331
t.exclude_pattern = 'spec/acceptance/**/*_spec.rb'
3432
end
3533

36-
task :default => :test
37-
34+
desc 'Run acceptance tests'
35+
task :acceptance do
36+
Rake::Task['litmus:acceptance:localhost'].invoke
37+
end

spec/spec_helper_acceptance_local.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frozen_string_literal: true
22

3-
require 'Shellwords'
3+
require 'shellwords'
44
require 'open3'
55
require 'rspec/expectations'
66

0 commit comments

Comments
 (0)