Skip to content

Commit

Permalink
Merge pull request #4 from EncoreTechnologies/feature/sync_fork
Browse files Browse the repository at this point in the history
Feature/sync fork
  • Loading branch information
bishopbm1 authored Aug 29, 2024
2 parents e433a08 + c59b66f commit 1813fcf
Show file tree
Hide file tree
Showing 107 changed files with 7,361 additions and 3,186 deletions.
26 changes: 11 additions & 15 deletions .fixtures.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
---
fixtures:
repositories:
inifile: 'https://github.com/puppetlabs/puppetlabs-inifile.git'
stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
postgresql: 'https://github.com/puppetlabs/puppet-postgresql.git'
firewall: 'https://github.com/puppetlabs/puppetlabs-firewall.git'
apt: 'https://github.com/puppetlabs/puppetlabs-apt.git'
concat: 'https://github.com/puppetlabs/puppetlabs-concat.git'
file_concat: 'https://github.com/electrical/puppet-lib-file_concat.git'
systemd: 'https://github.com/camptocamp/puppet-systemd.git'
cron: 'https://github.com/voxpupuli/puppet-cron.git'
cron_core:
repo: https://github.com/puppetlabs/puppetlabs-cron_core.git
puppet_version: ">= 6.0.0"
yumrepo_core:
repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
puppet_version: ">= 6.0.0"
augeas_core:
repo: https://github.com/puppetlabs/puppetlabs-augeas_core.git
puppet_version: ">= 6.0.0"
symlinks:
puppetdb: '#{source_dir}'
provision: 'https://github.com/puppetlabs/provision.git'
puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
cron_core: 'https://github.com/puppetlabs/puppetlabs-cron_core.git'
yumrepo_core: 'https://github.com/puppetlabs/puppetlabs-yumrepo_core.git'
augeas_core: 'https://github.com/puppetlabs/puppetlabs-augeas_core.git'
postgresql: 'https://github.com/puppetlabs/puppetlabs-postgresql.git'
firewall: 'https://github.com/puppetlabs/puppetlabs-firewall.git'
postgresql: 'https://github.com/puppetlabs/puppetlabs-postgresql.git'
firewall: 'https://github.com/puppetlabs/puppetlabs-firewall.git'
24 changes: 24 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
name: "ci"

on:
pull_request:
branches:
- "main"
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
Spec:
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
secrets: "inherit"

Acceptance:
needs: Spec
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
secrets: "inherit"
with:
runs_on: "ubuntu-20.04"
15 changes: 15 additions & 0 deletions .github/workflows/mend.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: "mend"

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

jobs:

mend:
uses: "puppetlabs/cat-github-actions/.github/workflows/mend_ruby.yml@main"
secrets: "inherit"
19 changes: 19 additions & 0 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: "nightly"

on:
schedule:
- cron: "0 0 * * *"
workflow_dispatch:

jobs:
Spec:
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
secrets: "inherit"

Acceptance:
needs: Spec
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
secrets: "inherit"
with:
runs_on: "ubuntu-20.04"
35 changes: 35 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: "Publish module"
run-name: >
${{ format('tag={0}', inputs.tag) }}
${{ format('release={0}', inputs.release) }}
${{ format('publish={0}', inputs.publish) }}
${{ format('edit={0}', inputs.edit) }}
on:
workflow_dispatch:
inputs:
tag:
description: "Enter an old tag, or blank to tag HEAD of branch"
type: string
release:
description: "Create a Github release"
type: boolean
default: true
publish:
description: "Publish to the Forge"
type: boolean
default: true
edit:
description: "Re-tag and regenerate release notes"
type: boolean
default: false

jobs:
release:
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@main"
secrets: "inherit"
with:
tag: ${{ inputs.tag }}
release: ${{ inputs.release }}
publish: ${{ inputs.publish }}
edit: ${{ inputs.edit }}
15 changes: 15 additions & 0 deletions .github/workflows/release_prep.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: "Release Prep"

on:
workflow_dispatch:
inputs:
version:
description: "Module version to be released. Must be a valid semver string. (1.2.3)"
required: true

jobs:
release_prep:
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release_prep.yml@main"
with:
version: "${{ github.event.inputs.version }}"
secrets: "inherit"
9 changes: 9 additions & 0 deletions .github/workflows/release_without.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: "Publish module without"

on:
workflow_dispatch:

jobs:
release:
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@main"
secrets: "inherit"
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/log/
/pkg/
/spec/fixtures/manifests/
/spec/fixtures/modules/
/spec/fixtures/modules/*
/tmp/
/vendor/
/convert_report.txt
Expand All @@ -25,3 +25,4 @@
.project
.envrc
/inventory.yaml
/spec/fixtures/litmus_inventory.yaml
45 changes: 0 additions & 45 deletions .nodeset.yml

This file was deleted.

18 changes: 13 additions & 5 deletions .pdkignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/log/
/pkg/
/spec/fixtures/manifests/
/spec/fixtures/modules/
/spec/fixtures/modules/*
/tmp/
/vendor/
/convert_report.txt
Expand All @@ -25,18 +25,26 @@
.project
.envrc
/inventory.yaml
/appveyor.yml
/spec/fixtures/litmus_inventory.yaml
/.fixtures.yml
/Gemfile
/.gitattributes
/.github/
/.gitignore
/.gitlab-ci.yml
/.pdkignore
/.puppet-lint.rc
/Rakefile
/rakelib/
/.rspec
/.rubocop.yml
/.travis.yml
/..yml
/.yardopts
/spec/
/.vscode/
/.sync.yml
/.devcontainer/
/.*.yml
/pdk.yaml
/.pmtignore
/.git*
/.editorconfig
/provision.yaml
2 changes: 2 additions & 0 deletions .puppet-lint.rc
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
--relative
--no-parameter_types-check
--no-140chars-check
1 change: 1 addition & 0 deletions .rspec_parallel
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--format progress
Loading

0 comments on commit 1813fcf

Please sign in to comment.