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

[puppetsync] Clean up for linters #154

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
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
21 changes: 20 additions & 1 deletion .github/workflows/add_new_issue_to_triage_project.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,26 @@
# Add new issues to triage project board (https://github.com/orgs/simp/projects/11)
# ------------------------------------------------------------------------------
#
# NOTICE: **This file is maintained with puppetsync**
#
# This file is updated automatically as part of a puppet module baseline.
#
# The next baseline sync will overwrite any local changes to this file!
#
# ==============================================================================
# This pipeline uses the following GitHub Action Secrets:
#
# GitHub Secret variable Notes
# ------------------------------- ---------------------------------------
# AUTO_TRIAGE_TOKEN Token with appropriate permissions
#
# ------------------------------------------------------------------------------
#
#
---
name: Add new issues to triage project

on:
'on':
issues:
types:
- opened
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/pr_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@
# The testing matrix considers ruby/puppet versions supported by SIMP and PE:
# ------------------------------------------------------------------------------
# Release Puppet Ruby EOL
# PE 2019.8 6.22 2.5 2022-12 (LTS)
# PE 2021.Y 7.x 2.7 Quarterly updates
# PE 2021.Y 7.x 2.7 2025-02 (LTS)
# PE 2023.Y 8.x 3.2 Biannual updates
#
# https://puppet.com/docs/pe/latest/component_versions_in_recent_pe_releases.html
# https://puppet.com/misc/puppet-enterprise-lifecycle
# ==============================================================================
#
# https://docs.github.com/en/actions/reference/events-that-trigger-workflows
#

---
name: PR Tests
on:
'on':
pull_request:
types: [opened, reopened, synchronize]

env:
PUPPET_VERSION: '~> 7'
PUPPET_VERSION: '~> 8'

jobs:
puppet-syntax:
Expand All @@ -38,7 +38,7 @@ jobs:
- name: "Install Ruby ${{matrix.puppet.ruby_version}}"
uses: ruby/setup-ruby@v1 # ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0
with:
ruby-version: 2.7
ruby-version: 3.2
bundler-cache: true
- run: "bundle exec rake syntax"

Expand All @@ -50,13 +50,13 @@ jobs:
- name: "Install Ruby ${{matrix.puppet.ruby_version}}"
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.2
bundler-cache: true
- run: "bundle exec rake lint"
- run: "bundle exec rake metadata_lint"

ruby-style:
if: false # TODO Modules will need: rubocop in Gemfile, .rubocop.yml
if: false # TODO Modules will need: rubocop in Gemfile, .rubocop.yml
name: 'Ruby Style (experimental)'
runs-on: ubuntu-latest
continue-on-error: true
Expand All @@ -65,7 +65,7 @@ jobs:
- name: "Install Ruby ${{matrix.puppet.ruby_version}}"
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.2
bundler-cache: true
- run: |
bundle show
Expand All @@ -76,10 +76,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: 'Install Ruby 2.7'
- name: 'Install Ruby 3.2'
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.2
bundler-cache: true
- run: bundle exec rake check:dot_underscore
- run: bundle exec rake check:test_file
Expand All @@ -92,7 +92,7 @@ jobs:
- name: 'Install Ruby ${{matrix.puppet.ruby_version}}'
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.2
bundler-cache: true
- name: 'Tags and changelogs'
run: |
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/release_rpms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
---
name: 'RELENG: Build + attach RPMs to GitHub Release'

on:
'on':
workflow_dispatch:
inputs:
release_tag:
Expand Down Expand Up @@ -71,10 +71,10 @@ on:
description: "Dry run (Test-build RPMs)"
required: false
default: 'no'
#verbose:
# description: 'Verbose RPM builds when "yes"'
# required: false
# default: 'no'
# verbose:
# description: 'Verbose RPM builds when "yes"'
# required: false
# default: 'no'
rebuild_number:
description: 'If this is an RPM rebuild, put the number of the rebuild here'
required: false
Expand Down Expand Up @@ -255,13 +255,13 @@ jobs:
simp_core_ref_for_building_rpms: ${{ secrets.SIMP_CORE_REF_FOR_BUILDING_RPMS }}
simp_builder_docker_image: 'docker.io/simpproject/simp_build_${{ github.event.inputs.build_container_os }}:latest'
path_to_build: "${{ (github.event.inputs.path_to_build != null && format('{0}/{1}', github.workspace, github.event.inputs.path_to_build)) || github.workspace }}"
verbose: 'no' #${{ github.event.inputs.verbose }}
verbose: 'no' # ${{ github.event.inputs.verbose }}

- name: "Wipe all previous assets from GitHub Release (when clean == 'yes')"
if: ${{ github.event.inputs.clean == 'yes' && github.event.inputs.dry_run != 'yes' }}
uses: actions/github-script@v6
env:
release_id: ${{ steps.release-api.outputs.id }}
release_id: ${{ steps.release-api.outputs.id }}
with:
github-token: ${{ github.event.inputs.target_repo_token || secrets.GITHUB_TOKEN }}
script: |
Expand All @@ -282,7 +282,7 @@ jobs:
env:
rpm_file_paths: ${{ steps.build-and-sign-rpm.outputs.rpm_file_paths }}
rpm_gpg_file: ${{ steps.build-and-sign-rpm.outputs.rpm_gpg_file }}
release_id: ${{ steps.release-api.outputs.id }}
release_id: ${{ steps.release-api.outputs.id }}
clobber: ${{ github.event.inputs.clobber }}
clean: ${{ github.event.inputs.clean }}
dry_run: ${{ github.event.inputs.dry_run }}
Expand Down
21 changes: 12 additions & 9 deletions .github/workflows/tag_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
---
name: 'Tag: Release to GitHub w/RPMs + Puppet Forge'

on:
'on':
push:
tags:
# NOTE: These filter patterns aren't actually regexes:
Expand All @@ -39,7 +39,7 @@ on:
- '[0-9]+\.[0-9]+\.[0-9]+\-[a-z]+[0-9]+'

env:
PUPPET_VERSION: '~> 7'
PUPPET_VERSION: '~> 8'

jobs:
releng-checks:
Expand All @@ -55,7 +55,7 @@ jobs:
clean: true
- uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.2
bundler-cache: true
- run: bundle exec rake pkg:check_version
- run: bundle exec rake pkg:compare_latest_tag
Expand All @@ -67,7 +67,8 @@ jobs:

create-github-release:
name: Deploy GitHub Release
needs: [ releng-checks ]
needs:
- releng-checks
if: github.repository_owner == 'simp'
runs-on: ubuntu-latest
outputs:
Expand Down Expand Up @@ -117,17 +118,18 @@ jobs:
id: create_release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
IS_PRERELASE: ${{ steps.tag-check.outputs.prerelease }}
IS_PRERELEASE: ${{ steps.tag-check.outputs.prerelease }}
run: |
echo "${RELEASE_MESSAGE}" > /tmp/.commit-msg.txt
args=(-F /tmp/.commit-msg.txt)
[[ $IS_PRERELASE == yes ]] && args+=(--prerelease)
[[ "$IS_PRERELEASE" == yes ]] && args+=(--prerelease)

gh release create ${args[@]} "$TARGET_TAG"

build-and-attach-rpms:
name: Trigger RPM release
needs: [ create-github-release ]
needs:
- create-github-release
if: github.repository_owner == 'simp'
runs-on: ubuntu-latest
env:
Expand Down Expand Up @@ -165,7 +167,8 @@ jobs:

deploy-to-puppet-forge:
name: 'Deploy PuppetForge Release'
needs: [ create-github-release ]
needs:
- create-github-release
if: (github.repository_owner == 'simp') && (needs.create-github-release.outputs.prerelease != 'yes')
runs-on: ubuntu-latest
env:
Expand All @@ -180,7 +183,7 @@ jobs:
clean: true
- uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.2
bundler-cache: true
- name: Build Puppet module (PDK)
run: bundle exec pdk build --force
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/validate_tokens.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
---
name: 'Manual: Validate API tokens'

on:
'on':
- workflow_dispatch

jobs:
Expand Down Expand Up @@ -66,4 +66,3 @@ jobs:
echo "::debug ::${scopes}"
exit 1
fi

Loading
Loading