From bc267049d94a892f5d1731568637b3729cd970eb Mon Sep 17 00:00:00 2001 From: Luchian Nemes Date: Tue, 6 Oct 2020 09:34:44 +0300 Subject: (maint) Add commit summary check This commit adds the `commits` rake task and runs it in the Static Code Analysis workflow as a step. --- .github/workflows/static_code_analysis.yaml | 5 +++++ Rakefile | 25 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/.github/workflows/static_code_analysis.yaml b/.github/workflows/static_code_analysis.yaml index ed4a232..9b94bf8 100644 --- a/.github/workflows/static_code_analysis.yaml +++ b/.github/workflows/static_code_analysis.yaml @@ -19,6 +19,8 @@ jobs: steps: - name: Checkout current PR code uses: actions/checkout@v2 + with: + fetch-depth: 0 - name: Install ruby version ${{ env.ruby_version }} uses: ruby/setup-ruby@v1 @@ -28,6 +30,9 @@ jobs: - name: Prepare testing environment with bundler run: 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 diff --git a/Rakefile b/Rakefile index e1d5f7b..7f91a3f 100644 --- a/Rakefile +++ b/Rakefile @@ -84,3 +84,28 @@ EOM end end +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 /^\((maint|packaging|doc|docs|modules-\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(MODULES-) # 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 -- cgit v1.2.3 From 303fd86610d132fa5abb5c0027976c7a940a3dc1 Mon Sep 17 00:00:00 2001 From: Luchian Nemes Date: Tue, 6 Oct 2020 09:35:38 +0300 Subject: (maint) Replace Windows 2019 with 2016 on GitHub Actions Unit tests seem to be running much faster on Windows 2016 with GitHub Actions than Windows 2019. --- .../daily_unit_tests_with_nightly_puppet_gem.yaml | 4 +- .../unit_test_with_released_puppet_gem.yaml | 48 ---------------------- .../unit_tests_with_nightly_puppet_gem.yaml | 4 +- .../unit_tests_with_released_puppet_gem.yaml | 48 ++++++++++++++++++++++ 4 files changed, 52 insertions(+), 52 deletions(-) delete mode 100644 .github/workflows/unit_test_with_released_puppet_gem.yaml create mode 100644 .github/workflows/unit_tests_with_released_puppet_gem.yaml diff --git a/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml b/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml index b31bf18..bf07dc5 100644 --- a/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml +++ b/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml @@ -10,7 +10,7 @@ jobs: name: ${{ matrix.os_type }} / Puppet${{ matrix.puppet_version }} gem / Ruby ${{ matrix.ruby }} strategy: matrix: - os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2019' ] + os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2016' ] puppet_version: [ 5, 6, 7 ] include: - puppet_version: 5 @@ -28,7 +28,7 @@ jobs: os_type: 'macOS' env_set_cmd: 'export ' gem_file: 'puppet-latest-universal-darwin.gem' - - os: 'windows-2019' + - os: 'windows-2016' os_type: 'Windows' env_set_cmd: '$env:' gem_file: 'puppet-latest-x64-mingw32.gem' diff --git a/.github/workflows/unit_test_with_released_puppet_gem.yaml b/.github/workflows/unit_test_with_released_puppet_gem.yaml deleted file mode 100644 index 5d044cd..0000000 --- a/.github/workflows/unit_test_with_released_puppet_gem.yaml +++ /dev/null @@ -1,48 +0,0 @@ ---- -name: Unit Tests with released Puppet gem - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - unit_tests_with_released_puppet_gem: - name: ${{ matrix.os_type }} / Puppet${{ matrix.puppet_version }} gem / Ruby ${{ matrix.ruby }} - strategy: - matrix: - os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2019' ] - puppet_version: [ 5, 6 ] - include: - - puppet_version: 5 - ruby: 2.4 - - puppet_version: 6 - ruby: 2.5 - - - os: 'ubuntu-18.04' - os_type: 'Linux' - - os: 'macos-10.15' - os_type: 'macOS' - - os: 'windows-2019' - os_type: 'Windows' - - runs-on: ${{ matrix.os }} - env: - PUPPET_GEM_VERSION: ~> ${{ matrix.puppet_version }}.0 - steps: - - name: Checkout current PR code - uses: actions/checkout@v2 - - - name: Install ruby version ${{ matrix.ruby }} - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby }} - - - name: Prepare testing environment with bundler - run: | - bundle config set system 'true' - bundle update --jobs 4 --retry 3 - - - name: Run unit tests - run: bundle exec rake parallel_spec diff --git a/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml b/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml index 8c5d909..b408ee8 100644 --- a/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml +++ b/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml @@ -12,7 +12,7 @@ jobs: name: ${{ matrix.os_type }} / Puppet${{ matrix.puppet_version }} gem / Ruby ${{ matrix.ruby }} strategy: matrix: - os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2019' ] + os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2016' ] puppet_version: [ 5, 6, 7 ] include: - puppet_version: 5 @@ -30,7 +30,7 @@ jobs: os_type: 'macOS' env_set_cmd: 'export ' gem_file: 'puppet-latest-universal-darwin.gem' - - os: 'windows-2019' + - os: 'windows-2016' os_type: 'Windows' env_set_cmd: '$env:' gem_file: 'puppet-latest-x64-mingw32.gem' diff --git a/.github/workflows/unit_tests_with_released_puppet_gem.yaml b/.github/workflows/unit_tests_with_released_puppet_gem.yaml new file mode 100644 index 0000000..47385ac --- /dev/null +++ b/.github/workflows/unit_tests_with_released_puppet_gem.yaml @@ -0,0 +1,48 @@ +--- +name: Unit Tests with released Puppet gem + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + unit_tests_with_released_puppet_gem: + name: ${{ matrix.os_type }} / Puppet${{ matrix.puppet_version }} gem / Ruby ${{ matrix.ruby }} + strategy: + matrix: + os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2016' ] + puppet_version: [ 5, 6 ] + include: + - puppet_version: 5 + ruby: 2.4 + - puppet_version: 6 + ruby: 2.5 + + - os: 'ubuntu-18.04' + os_type: 'Linux' + - os: 'macos-10.15' + os_type: 'macOS' + - os: 'windows-2016' + os_type: 'Windows' + + runs-on: ${{ matrix.os }} + env: + PUPPET_GEM_VERSION: ~> ${{ matrix.puppet_version }}.0 + steps: + - name: Checkout current PR code + uses: actions/checkout@v2 + + - name: Install ruby version ${{ matrix.ruby }} + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby }} + + - name: Prepare testing environment with bundler + run: | + bundle config set system 'true' + bundle update --jobs 4 --retry 3 + + - name: Run unit tests + run: bundle exec rake parallel_spec -- cgit v1.2.3 From a622e0003ee04293423b07826cd80253687779b7 Mon Sep 17 00:00:00 2001 From: Luchian Nemes Date: Tue, 6 Oct 2020 09:35:53 +0300 Subject: (maint) Add pdk and blacksmith back in Gemfile During the removal of `puppet-module-dev`, the pdk and puppet-blacksmith gems were also removed by mistake. This commit makes us able to release again. --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile b/Gemfile index 3444d32..dd48fcc 100644 --- a/Gemfile +++ b/Gemfile @@ -46,6 +46,8 @@ group :system_tests do gem "beaker-hostgenerator" gem "beaker-rspec" gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 1.0') + gem "pdk", '~> 1.18', platforms: [:ruby] + gem "puppet-blacksmith", '~> 3.4', require: false end puppet_version = ENV['PUPPET_GEM_VERSION'] -- cgit v1.2.3