Merge branch 'main' into newfield-nic-migration-update

Author: jnewfield

.github/labeler.yml

@@ -67,7 +67,7 @@ product/nginx-one:
           - 'content/nginx-one/**'
           - 'content/includes/nginx-one/**'
 
-product/nginxaas:
+product/nginxaas-azure:
   - changed-files:
       - any-glob-to-any-file:
           - 'content/nginxaas-azure/**'

.github/pull_request_template.md

@@ -14,7 +14,7 @@
 [//]: # "If the changes were defined by a GitHub issue, reference it using keywords."
 [//]: # "https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests"
 
-[//]: # "Do not like to any internal, non-public resources. This includes internal repository issues or anything in an intranet."
+[//]: # "Do not link to any internal, non-public resources. This includes internal repository issues or anything in an intranet."
 [//]: # "You can make reference to internal discussions without linking to them: see 'Referencing internal information'."
 [//]: # "https://github.com/nginx/documentation/blob/main/documentation/closed-contributions.md#referencing-internal-information"
 

.github/workflows/build-push.yml

@@ -80,7 +80,7 @@ jobs:
     permissions: read-all
     steps:
       - name: Send notification
-        uses:  8398a7/action-slack@1750b5085f3ec60384090fb7c52965ef822e869e # v3.18.0
+        uses:  8398a7/action-slack@77eaa4f1c608a7d68b38af4e3f739dcd8cba273e # v3.19.0
         with: 
           status: custom
           custom_payload: |
@@ -115,51 +115,4 @@ jobs:
             }
     env:
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL_FRIENDS_OF_DOCS }}
-      PREVIEW_URL: ${{ needs.call-docs-build-push.outputs.PREVIEW_URL }}
-
-
-  lighthouseci:
-    if: github.event.pull_request
-    needs: call-docs-build-push
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v5
-        with:
-          ref: ${{ github.event.workflow_run.head_branch }}
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18
-      - name: Installing packages
-        run: npm install
-      - name: Generating lighthouse reports for PR and main...
-        run: | 
-            node lighthouse-script.js
-      - name: Compare the artifacts for negative differences in performance
-        continue-on-error: true
-        run: |
-            FIELDS=("performance" "accessibility") 
-            for FIELD in "${FIELDS[@]}"; do
-                PR_VALUE=$(cat lighthouse-reports/pr-report.json | jq -r ".categories.$FIELD.score")
-                MAIN_VALUE=$(cat lighthouse-reports/main-report.json | jq -r ".categories.$FIELD.score")
-                echo "$FIELD: PR - $PR_VALUE | Main - $MAIN_VALUE"
-
-                if [ $FIELD = "performance" ]; then  
-                  LOWER_BOUND=$(echo "$MAIN_VALUE - 0.05" | bc)
-                  UPPER_BOUND=$(echo "$MAIN_VALUE + 0.05" | bc)
-                  if (( $(echo "$PR_VALUE < $LOWER_BOUND" | bc -l) || $(echo "$PR_VALUE > $UPPER_BOUND" | bc -l) )); then
-                      echo "Error: $FIELD score in PR ($PR_VALUE) is less than in MAIN ($MAIN_VALUE)"
-                      exit 1
-                  fi
-                else
-                  if (( $(echo "$PR_VALUE < $MAIN_VALUE" | bc -l) )); then
-                    echo "Error: $FIELD score in PR ($PR_VALUE) is less than in MAIN ($MAIN_VALUE)"
-                    exit 1
-                  fi
-                fi
-            done
-      - uses: actions/upload-artifact@v4
-        if: ${{ !cancelled() }}
-        with:
-            name: lighthouse-reports
-            path: lighthouse-reports/
-            retention-days: 30
+      PREVIEW_URL: ${{ needs.call-docs-build-push.outputs.PREVIEW_URL }}

.github/workflows/dot-org-content.yml

@@ -12,6 +12,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Apply labels based on file paths
-        uses: actions/labeler@v5
+        uses: actions/labeler@v6
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/labeler.yml

@@ -5,6 +5,7 @@ on:
     workflows:
       - "QE LinkChecker"
       - "Check for Broken Links"
+      - "UI validation on prod"
     types: [completed]
 
 permissions:
@@ -20,7 +21,7 @@ jobs:
       checks: read
     steps:
       - name: Retrieve Job Data
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         continue-on-error: true
         id: data
         with:
@@ -41,7 +42,7 @@ jobs:
             }
 
       - name: Send notification
-        uses: 8398a7/action-slack@1750b5085f3ec60384090fb7c52965ef822e869e # v3.18.0
+        uses: 8398a7/action-slack@77eaa4f1c608a7d68b38af4e3f739dcd8cba273e # v3.19.0
         with:
           status: custom
           custom_payload: |

.github/workflows/notification.yml

@@ -56,6 +56,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: Upload SARIF results to code scanning
-        uses: github/codeql-action/upload-sarif@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.5
+        uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
         with:
           sarif_file: results.sarif

.github/workflows/ossf_scorecard.yml

@@ -0,0 +1,32 @@
+name: UI validation on prod
+on: 
+  workflow_dispatch:
+  schedule:
+    - cron: "0 * * * *"
+
+jobs:
+  run-playwright-tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v5
+      with:
+        node-version: lts/*
+    - name: Install dependencies
+      run: npm ci
+    - name: Install Playwright Browsers
+      run: npx playwright install --with-deps
+    - name: Run Playwright tests
+      run: npx playwright test --retries=2
+    - uses: actions/upload-artifact@v4
+      if: ${{ !cancelled() }}
+      with:
+        name: playwright-report
+        path: tests/playwright-report/
+        retention-days: 30
+    - uses: actions/upload-artifact@v4
+      if: ${{ !cancelled() }}
+      with:
+        name: test-results
+        path: tests/test-results/
+        retention-days: 30

.github/workflows/playwright.yml

@@ -18,7 +18,7 @@ jobs:
       pull-requests: write  # for actions/stale to close stale PRs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9.1.0
+      - uses: actions/stale@v10.0.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-issue-message: 'This issue is stale because it has been open for 90 days with no activity. Remove the stale label or add a comment to keep it open. If you do not take action, this will be closed in 10 days.'

.github/workflows/stale.yml

@@ -35,11 +35,13 @@ resources/
 .netlify/plugins/*
 .netlify/
 
-# Local Lighthouse artifacts
-lighthouse-reports
-
 *.pyc
 build
 *.swp
 *.mo
 node_modules
+
+# Playwright
+/coverage
+*/test-results
+*/playwright-report