Merge branch 'main' into update-next-13.3.0

netlify · Apr 27, 2023 · fed7e3f · fed7e3f
2 parents a418389 + 25108c5
commit fed7e3f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 18 deletions.
diff --git a/.github/workflows/cypress-canary.yml b/.github/workflows/cypress-canary.yml
@@ -13,10 +13,6 @@ jobs:
   cypress:
     name: Cypress
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        containers: [1, 2, 3, 4]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -59,9 +55,7 @@ jobs:
         uses: cypress-io/github-action@v5
         with:
           browser: chrome
-          headless: true
           record: true
-          parallel: true
           config-file: cypress/config/canary.config.ts
           group: 'Next Runtime - Demo Canary'
           spec: cypress/e2e/canary/*

diff --git a/.github/workflows/cypress-demo-nx.yml b/.github/workflows/cypress-demo-nx.yml
@@ -13,10 +13,6 @@ jobs:
   cypress:
     name: Cypress
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        containers: [1, 2, 3, 4]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -59,9 +55,7 @@ jobs:
         uses: cypress-io/github-action@v5
         with:
           browser: chrome
-          headless: true
           record: true
-          parallel: true
           config-file: cypress/config/nx-demo.config.ts
           group: 'Next Runtime - Demo NX'
           spec: cypress/e2e/nx/*

diff --git a/.github/workflows/cypress-demo-static.yml b/.github/workflows/cypress-demo-static.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        containers: [1, 2, 3, 4]
+        containers: [1, 2]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -59,7 +59,6 @@ jobs:
         uses: cypress-io/github-action@v5
         with:
           browser: chrome
-          headless: true
           record: true
           parallel: true
           config-file: cypress/config/static-root.config.ts

diff --git a/.github/workflows/cypress-demo.yml b/.github/workflows/cypress-demo.yml
@@ -59,7 +59,6 @@ jobs:
         uses: cypress-io/github-action@v5
         with:
           browser: chrome
-          headless: true
           record: true
           parallel: true
           config-file: cypress/config/ci.config.ts

diff --git a/.github/workflows/cypress-middleware.yml b/.github/workflows/cypress-middleware.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        containers: [1, 2, 3, 4]
+        containers: [1, 2]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -59,7 +59,6 @@ jobs:
         uses: cypress-io/github-action@v5
         with:
           browser: chrome
-          headless: true
           record: true
           parallel: true
           config-file: cypress/config/middleware.config.ts

diff --git a/renovate.json b/renovate.json
@@ -1,4 +1,16 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["local>netlify/renovate-config"]
+  "extends": ["local>netlify/renovate-config"],
+  "packageRules": [
+    {
+      "groupName": "Next.js",
+      "matchPackagePatterns": ["next"],
+      "matchUpdateTypes": ["patch", "minor"]
+    },
+    {
+      "groupName": "Next.js (Major)",
+      "matchPackagePatterns": ["next"],
+      "matchUpdateTypes": ["major"]
+    }
+  ]
 }