From c2866842b30eb684f6a7d1866fb67744a00f5240 Mon Sep 17 00:00:00 2001 From: Ryan DeShone Date: Mon, 13 Jul 2026 11:31:53 -0400 Subject: [PATCH] Move to puppet-lint-action --- .github/workflows/puppet-lint.yml | 29 +++-------------- .gitlab-ci.yml | 53 ------------------------------- 2 files changed, 5 insertions(+), 77 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.github/workflows/puppet-lint.yml b/.github/workflows/puppet-lint.yml index af0f734..7dfac72 100644 --- a/.github/workflows/puppet-lint.yml +++ b/.github/workflows/puppet-lint.yml @@ -17,32 +17,13 @@ permissions: jobs: puppet-lint: - name: Run puppet-lint scanning runs-on: ubuntu-latest - permissions: - contents: read # for checkout to fetch code - security-events: write # for github/codeql-action/upload-sarif to upload SARIF results - actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status steps: - - name: Checkout code - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v4 - - name: Setup Ruby, JRuby and TruffleRuby - uses: ruby/setup-ruby@v1.120.0 + - name: puppet-lint + uses: scottbrenner/puppet-lint-action@v1.0.9 with: - ruby-version: 2.7 - bundler-cache: true - - - name: Install puppet-lint - run: gem install puppet-lint - - - name: Run puppet-lint - run: puppet-lint **/*.pp --sarif > puppet-lint-results.sarif - continue-on-error: true - - - name: Upload analysis results to GitHub - uses: github/codeql-action/upload-sarif@v2 - with: - sarif_file: puppet-lint-results.sarif - wait-for-processing: true + args: ./ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index fd0d11a..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,53 +0,0 @@ ---- -stages: - - syntax - - unit - -default: - cache: - paths: - - vendor/bundle - - before_script: &before_script - - bundle -v - - rm Gemfile.lock || true - - "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner" - - "# Set `rubygems_version` in the .sync.yml to set a value" - - "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set" - - '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION' - - gem --version - - bundle -v - - bundle install --without system_tests --path vendor/bundle --jobs $(nproc) - -syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop-Ruby 2.5.7-Puppet ~> 6: - stage: syntax - image: ruby:2.5.7 - script: - - bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop - variables: - PUPPET_GEM_VERSION: '~> 6' - -parallel_spec-Ruby 2.5.7-Puppet ~> 6: - stage: unit - image: ruby:2.5.7 - script: - - bundle exec rake parallel_spec - variables: - PUPPET_GEM_VERSION: '~> 6' - -syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop-Ruby 2.7.2-Puppet ~> 7: - stage: syntax - image: ruby:2.7.2 - script: - - bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop - variables: - PUPPET_GEM_VERSION: '~> 7' - -parallel_spec-Ruby 2.7.2-Puppet ~> 7: - stage: unit - image: ruby:2.7.2 - script: - - bundle exec rake parallel_spec - variables: - PUPPET_GEM_VERSION: '~> 7' -