Skip to content
Open
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
42 changes: 25 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,38 @@ on:
pull_request:
branches:
- "main"
pull_request_target:
types: [labeled]
branches:
- "main"
workflow_dispatch:


permissions:
contents: read

concurrency:
# On pull_request_target, github.ref is the base branch, so key on the PR number
# (and the event) to keep runs of different PRs from cancelling each other. The
# label is in the key so that adding another label to the same PR doesn't cancel
# its allowed-for-ci acceptance run; re-adding allowed-for-ci still replaces it.
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref }}-${{ github.event.label.name }}
cancel-in-progress: true

jobs:
Spec:
if: github.event_name != 'pull_request_target'
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
with:
# puppet_litmus -> bolt 4.x -> faraday-patron -> patron builds a libcurl native extension;
# the runner has no libcurl headers, so install them before bundle (Puppet 9 lane, Ruby 4).
additional_packages: "libcurl4-openssl-dev"
ruby_version: "3.2"
secrets: "inherit"

Acceptance:
needs: Spec
if: >-
github.event_name == 'workflow_dispatch' ||
(github.event_name == 'pull_request' &&
github.event.pull_request.head.repo.fork == false) ||
(github.event_name == 'pull_request_target' &&
github.event.pull_request.head.repo.fork == true &&
github.event.label.name == 'allowed-for-ci')
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
with:
ruby_version: "3.2"
flags: >-
--nightly
--arch-exclude arm
--collection-platform-exclude 9:redhat-7
--collection-platform-exclude 9:centos-7
--collection-platform-exclude 9:oraclelinux-7
--collection-platform-exclude 9:debian-10
--collection-platform-exclude 9:ubuntu-18.04
--collection-platform-exclude 9:ubuntu-20.04
flags: "--nightly --arch-exclude arm --collection-platform-exclude 9:redhat-7 --collection-platform-exclude 9:centos-7 --collection-platform-exclude 9:oraclelinux-7 --collection-platform-exclude 9:debian-10 --collection-platform-exclude 9:ubuntu-18.04 --collection-platform-exclude 9:ubuntu-20.04"
secrets: "inherit"
16 changes: 1 addition & 15 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,10 @@ jobs:
Spec:
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
secrets: "inherit"
with:
# puppet_litmus -> bolt 4.x -> faraday-patron -> patron builds a libcurl native extension;
# the runner has no libcurl headers, so install them before bundle (Puppet 9 lane, Ruby 4).
additional_packages: "libcurl4-openssl-dev"
ruby_version: "3.2"

Acceptance:
needs: Spec
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
with:
ruby_version: "3.2"
flags: >-
--nightly
--arch-exclude arm
--collection-platform-exclude 9:redhat-7
--collection-platform-exclude 9:centos-7
--collection-platform-exclude 9:oraclelinux-7
--collection-platform-exclude 9:debian-10
--collection-platform-exclude 9:ubuntu-18.04
--collection-platform-exclude 9:ubuntu-20.04
flags: "--nightly --arch-exclude arm --collection-platform-exclude 9:redhat-7 --collection-platform-exclude 9:centos-7 --collection-platform-exclude 9:oraclelinux-7 --collection-platform-exclude 9:debian-10 --collection-platform-exclude 9:ubuntu-18.04 --collection-platform-exclude 9:ubuntu-20.04"
secrets: "inherit"
2 changes: 1 addition & 1 deletion .pdkignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ bolt-debug.log
/Rakefile
/rakelib/
/.rspec
/..yml
/.rubocop.yml
/.yardopts
/spec/
/.vscode/
Expand Down
1 change: 1 addition & 0 deletions .puppet-lint.rc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
--no-autoloader_layout-check
--no-documentation-check
--no-single_quote_string_with_variables-check
--no-strict_indent-check
--ignore-paths=.vendor/**/*.pp,.bundle/**/*.pp,pkg/**/*.pp,spec/**/*.pp,tests/**/*.pp,types/**/*.pp,vendor/**/*.pp
Loading
Loading