Skip to content

Commit

Permalink
Merge pull request #348 from puppetlabs/CONT-812-ruby_3
Browse files Browse the repository at this point in the history
(CONT-812) Puppet 8 / Ruby 3 support
  • Loading branch information
jordanbreen28 authored Apr 17, 2023
2 parents 4ad650d + fc22265 commit 6beaa30
Show file tree
Hide file tree
Showing 86 changed files with 866 additions and 1,691 deletions.
3 changes: 2 additions & 1 deletion .fixtures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ fixtures:
facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
provision: 'https://github.com/puppetlabs/provision.git'
puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
symlinks: []
symlinks:
test: "#{source_dir}/spec/fixtures/acceptance/modules/test"
43 changes: 36 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,53 @@
name: "ci"

on:
schedule:
- cron: "0 0 * * *"
pull_request:
branches:
- "main"
workflow_dispatch:

jobs:

spec:
strategy:
fail-fast: false
matrix:
ruby_version:
- "2.7"
- "3.2"
include:
- ruby-version: '2.7'
puppet_gem_version: '~> 7.0'
- ruby_version: '3.2'
puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8'
runs_on:
- "ubuntu-latest"
- "windows-latest"
name: "spec (${{ matrix.runs_on }} ruby ${{ matrix.ruby_version }} | puppet ${{matrix.puppet_gem_version}})"
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
secrets: "inherit"
with:
ruby_version: ${{ matrix.ruby_version }}
puppet_gem_version: ${{ matrix.puppet_gem_version }}
runs_on: ${{ matrix.runs_on }}

acceptance:
needs: "spec"
strategy:
matrix:
puppet:
- "puppet6"
- "puppet7"
ruby_version:
- "2.7"
- "3.2"
include:
- ruby-version: '2.7'
puppet_gem_version: '~> 7.0'
- ruby_version: '3.2'
puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8'
runs_on:
- "ubuntu-latest"
- "windows-latest"
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
secrets: "inherit"
with:
puppet_version: ${{ matrix.puppet }}
ruby_version: ${{ matrix.ruby_version }}
puppet_version: ${{ matrix.puppet_gem_version }}
runs_on: ${{ matrix.runs_on }}
43 changes: 35 additions & 8 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,52 @@
name: "nightly"

on:
pull_request:
branches:
- "main"
schedule:
- cron: "0 0 * * *"
workflow_dispatch:

jobs:

spec:
strategy:
fail-fast: false
matrix:
ruby_version:
- "2.7"
- "3.2"
include:
- ruby-version: '2.7'
puppet_gem_version: '~> 7.0'
- ruby_version: '3.2'
puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8'
runs_on:
- "ubuntu-latest"
- "windows-latest"
name: "spec (${{ matrix.runs_on }} ruby ${{ matrix.ruby_version }} | puppet ${{matrix.puppet_gem_version}})"
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
secrets: "inherit"
with:
ruby_version: ${{ matrix.ruby_version }}
puppet_gem_version: ${{ matrix.puppet_gem_version }}
runs_on: ${{ matrix.runs_on }}

acceptance:
needs: "spec"
strategy:
matrix:
puppet:
- "puppet6"
- "puppet7"
ruby_version:
- "2.7"
- "3.2"
include:
- ruby-version: '2.7'
puppet_gem_version: '~> 7.0'
- ruby_version: '3.2'
puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8'
runs_on:
- "ubuntu-latest"
- "windows-latest"
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
secrets: "inherit"
with:
puppet_version: ${{ matrix.puppet }}
ruby_version: ${{ matrix.ruby_version }}
puppet_version: ${{ matrix.puppet_gem_version }}
runs_on: ${{ matrix.runs_on }}
Loading

0 comments on commit 6beaa30

Please sign in to comment.