From 680feef090108c25335d1dfda24960e9c2f1f43e Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Thu, 30 Nov 2023 09:36:50 -0800 Subject: [PATCH 1/3] (PA-5395) Use reusable static code analysis This commit updates the static code analysis GitHub Actions workflow from using a copy in this repository to a resuable copy in the Phoenix team centralized GitHub Actions repository. In addition, this removes the commits Rake task as it is no longer used in the reusable version of this workflow. --- .github/workflows/static_code_analysis.yaml | 40 ++------------------- rakelib/commits.rake | 25 ------------- 2 files changed, 2 insertions(+), 63 deletions(-) delete mode 100644 rakelib/commits.rake diff --git a/.github/workflows/static_code_analysis.yaml b/.github/workflows/static_code_analysis.yaml index 575cde7..62438da 100644 --- a/.github/workflows/static_code_analysis.yaml +++ b/.github/workflows/static_code_analysis.yaml @@ -6,44 +6,8 @@ on: branches: [ main ] pull_request: branches: [ main ] + workflow_dispatch: jobs: static_code_analysis: - name: Run checks - - env: - ruby_version: 2.6 - extra_checks: check:symlinks check:git_ignore check:dot_underscore check:test_file - - 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 rubocop check - run: bundle exec rake ${{ env.extra_checks }} rubocop - - - name: Run syntax check - run: bundle exec rake ${{ env.extra_checks }} syntax syntax:hiera syntax:manifests syntax:templates - - - name: Run lint check - run: bundle exec rake ${{ env.extra_checks }} lint - - - name: Run metadata_lint check - run: bundle exec rake ${{ env.extra_checks }} metadata_lint + 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 7cee9fa..0000000 --- a/rakelib/commits.rake +++ /dev/null @@ -1,25 +0,0 @@ -desc "verify that commit summaries are properly formatted" -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|modules|pa-\d+)\)|revert/i.match(commit_summary).nil? - raise "\n\n\n\tPlease make sure that your commit summary (i.e. the first line of the commit message) starts with one of the following:\n" \ - "\t\t(PA-)\n" \ - "\t\t(MODULES-)\n" \ - "\t\t(docs)\n" \ - "\t\t(docs)(DOCUMENT-)\n" \ - "\t\t(packaging)\n" - "\t\t(maint)\n" \ - "\t\tRelease prep v\n" \ - "\n\tThis test for the commit summary is case-insensitive.\n\n\n" - else - puts "#{commit_summary}" - end - puts "...passed" - end -end From 70e936a09144d2d0c013573497c5498f1b76285f Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Thu, 30 Nov 2023 09:37:49 -0800 Subject: [PATCH 2/3] (PA-5395) Update issues URL in metadata.json --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 3e6e85d..a689f1c 100644 --- a/metadata.json +++ b/metadata.json @@ -6,7 +6,7 @@ "license": "Apache-2.0", "source": "https://github.com/puppetlabs/puppetlabs-augeas_core", "project_page": "https://github.com/puppetlabs/puppetlabs-augeas_core", - "issues_url": "https://tickets.puppetlabs.com/projects/MODULES", + "issues_url": "https://github.com/puppetlabs/puppetlabs-augeas_core/issues", "dependencies": [ ], From efec50f11c3ad882f56cb411893337ccd7612c55 Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Thu, 30 Nov 2023 09:48:11 -0800 Subject: [PATCH 3/3] (PA-5395) Add Jira workflow This commit adds a GitHub Actions workflow to export issues from GitHub into Jira. --- .github/workflows/jira.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/jira.yml diff --git a/.github/workflows/jira.yml b/.github/workflows/jira.yml new file mode 100644 index 0000000..a0d49d6 --- /dev/null +++ b/.github/workflows/jira.yml @@ -0,0 +1,19 @@ +--- +name: Export issue to Jira + +on: + issues: + types: [labeled] + +permissions: + issues: write + +jobs: + export: + uses: "puppetlabs/phoenix-github-actions/.github/workflows/jira.yml@main" + with: + jira-project: PA + jira-base-url: ${{ vars.jira_base_url }} + jira-user-email: ${{ vars.jira_user_email }} + secrets: + jira-api-token: ${{ secrets.JIRA_ISSUES_ACTION }}