diff --git a/.github/workflows/static_code_analysis.yaml b/.github/workflows/static_code_analysis.yaml index d67c4c62..62438dae 100644 --- a/.github/workflows/static_code_analysis.yaml +++ b/.github/workflows/static_code_analysis.yaml @@ -6,46 +6,8 @@ on: branches: [ main ] pull_request: branches: [ main ] + workflow_dispatch: jobs: static_code_analysis: - name: Run checks - - env: - ruby_version: '2.7' - - runs-on: 'ubuntu-20.04' - steps: - - name: Checkout current PR code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Install ruby version ${{ env.ruby_version }} - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ env.ruby_version }} - - - name: Prepare testing environment with bundler - run: | - git config --global core.longpaths true - bundle config set --local without 'release' - bundle update --jobs 4 --retry 3 - - - name: Run commits check - run: bundle exec rake commits - - - name: Run validate check - run: bundle exec rake validate - - - name: Run lint check - run: bundle exec rake lint - - - name: Run metadata_lint check - run: bundle exec rake metadata_lint - - - name: Run syntax check - run: bundle exec rake syntax syntax:hiera syntax:manifests syntax:templates - - - name: Run rubocop check - run: bundle exec rake rubocop + uses: "puppetlabs/phoenix-github-actions/.github/workflows/static_code_analysis.yaml@main" diff --git a/rakelib/commits.rake b/rakelib/commits.rake deleted file mode 100644 index 92ea4b40..00000000 --- a/rakelib/commits.rake +++ /dev/null @@ -1,25 +0,0 @@ -desc "verify that commit messages match CONTRIBUTING.md requirements" -task(:commits) do - # This rake task looks at the summary from every commit from this branch not - # in the branch targeted for a PR. - commit_range = 'HEAD^..HEAD' - puts "Checking commits #{commit_range}" - %x{git log --no-merges --pretty=%s #{commit_range}}.each_line do |commit_summary| - # This regex tests for the currently supported commit summary tokens. - # The exception tries to explain it in more full. - if /^Release prep|\((maint|packaging|doc|docs|pa-\d+)\)|revert/i.match(commit_summary).nil? - raise "\n\n\n\tThis commit summary didn't match CONTRIBUTING.md guidelines:\n" \ - "\n\t\t#{commit_summary}\n" \ - "\tThe commit summary (i.e. the first line of the commit message) should start with one of:\n" \ - "\t\t(PA-) # this is most common and should be a ticket at tickets.puppet.com\n" \ - "\t\t(docs)\n" \ - "\t\t(docs)(DOCUMENT-)\n" \ - "\t\t(packaging)\n" - "\t\t(maint)\n" \ - "\n\tThis test for the commit summary is case-insensitive.\n\n\n" - else - puts "#{commit_summary}" - end - puts "...passed" - end -end