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

Puppet 8 support #163

Merged
merged 22 commits into from
Sep 25, 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 .fixtures.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
fixtures:
repositories:
"concat": "git://github.com/puppetlabs/puppetlabs-concat.git"
"stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
symlinks:
"puppi": "#{source_dir}"
"stdlib": "https://github.com/puppetlabs/puppetlabs-stdlib.git"
"concat": "https://github.com/puppetlabs/puppetlabs-concat.git"
71 changes: 71 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ master ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
schedule:
- cron: '38 21 * * 1'


jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'ruby' ]

steps:
- name: Checkout repository
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality


# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
49 changes: 49 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
---
name: PR tests

on: pull_request

jobs:
static:
name: 'Syntax validation'
runs-on: ubuntu-latest
timeout-minutes: 10
container: puppet/pdk:3.3.0.0
steps:
- uses: actions/checkout@v4
- name: Run static validations
run: /usr/local/bin/pdk bundle exec rake validate lint check
env:
BUNDLE_WITHOUT: development:system_tests:release

unit:
name: 'Unit tests'
runs-on: ubuntu-latest
timeout-minutes: 60
# container: puppet/puppet-dev-tools:4.x
container: puppet/pdk:3.3.0.0
steps:
- uses: actions/checkout@v4
- name: Run unit tests on Puppet 8
run: /usr/local/bin/pdk test unit --puppet-version=8
env:
BUNDLE_WITHOUT: development:system_tests:release
continue-on-error: true
- name: Run unit tests on Puppet 7
run: /usr/local/bin/pdk test unit --puppet-version=7
env:
BUNDLE_WITHOUT: development:system_tests:release
continue-on-error: true

unit_legacy:
name: 'Unit tests Legacy Puppet'
runs-on: ubuntu-latest
timeout-minutes: 60
container: puppet/puppet-dev-tools:4.x
steps:
- uses: actions/checkout@v4
- name: Run unit tests on Puppet 6
run: /usr/local/bin/pdk test unit --puppet-version=6
env:
BUNDLE_WITHOUT: development:system_tests:release
continue-on-error: true
29 changes: 29 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
name: Release

on:
push:
tags:
- '*'

env:
BUNDLE_WITHOUT: development:test:system_tests

jobs:
deploy:
name: 'Deploy to forge'
runs-on: ubuntu-latest
if: github.repository_owner == 'example42'
container: puppet/pdk:3.3.0.0
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: "PDK Build"
uses: docker://puppet/pdk:3.3.0.0
with:
args: 'build'
- name: "Push to Forge"
uses: docker://puppet/pdk:3.3.0.0
with:
args: 'release publish --forge-token ${{ secrets.PUPPET_FORGE_API_KEY }} --force'

13 changes: 12 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,20 @@
/log/
/pkg/
/spec/fixtures/manifests/
/spec/fixtures/modules/
/spec/fixtures/modules/*
/tmp/
/vendor/
/.vendor/
/convert_report.txt
/update_report.txt
.DS_Store
.project
.envrc
/inventory.yaml
/spec/fixtures/litmus_inventory.yaml
.resource_types
.modules
.task_cache.json
.plan_cache.json
.rerun.json
bolt-debug.log
29 changes: 28 additions & 1 deletion .pdkignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,36 @@
/log/
/pkg/
/spec/fixtures/manifests/
/spec/fixtures/modules/
/spec/fixtures/modules/*
/tmp/
/vendor/
/.vendor/
/convert_report.txt
/update_report.txt
.DS_Store
.project
.envrc
/inventory.yaml
/spec/fixtures/litmus_inventory.yaml
.resource_types
.modules
.task_cache.json
.plan_cache.json
.rerun.json
bolt-debug.log
/.fixtures.yml
/Gemfile
/.gitattributes
/.github/
/.gitignore
/.pdkignore
/.puppet-lint.rc
/Rakefile
/rakelib/
/.rspec
/..yml
/.yardopts
/spec/
/.vscode/
/.sync.yml
/.devcontainer/
23 changes: 0 additions & 23 deletions .project

This file was deleted.

3 changes: 3 additions & 0 deletions .puppet-lint.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
--relative
--no-parameter_documentation
--no-params_empty_string
Loading
Loading