Merge pull request #9032 from joshcooper/merge_7x_main_mar

(maint) Merge 7.x to main

Author: joshcooper

.gitattributes

@@ -0,0 +1,6 @@
+# Disable NL -> CRNL translation on Windows. This is necessary because the files on disk must
+# match the checksums in metadata.json.
+spec/fixtures/integration/application/module/environments/direnv/modules/nginx/README -text
+spec/fixtures/integration/application/module/environments/direnv/modules/nginx/metadata.json -text
+spec/fixtures/integration/application/module/environments/direnv/modules/nginx/Modulefile -text
+spec/fixtures/integration/application/module/environments/direnv/modules/nginx/manifests/init.pp -text

.github/workflows/checks.yaml

@@ -16,9 +16,9 @@ jobs:
     strategy:
       matrix:
         cfg:
-          - {check: rubocop, os: ubuntu-latest, ruby: 2.7}
-          - {check: commits, os: ubuntu-latest, ruby: 2.7}
-          - {check: warnings, os: ubuntu-latest, ruby: 2.7}
+          - {check: rubocop, os: ubuntu-latest, ruby: '2.7'}
+          - {check: commits, os: ubuntu-latest, ruby: '2.7'}
+          - {check: warnings, os: ubuntu-latest, ruby: '2.7'}
 
     runs-on: ${{ matrix.cfg.os }}
     steps:

.github/workflows/mend.yaml

@@ -3,7 +3,7 @@ name: Mend Monitor
 on:
   push:
     branches:
-      - 7.x
+      - main
 jobs:
   mend_monitor:
     if: ${{ github.repository_owner == 'puppetlabs' }}