Merge branch 'main' into restore-decorator-support_contribute-main

Author: alexandrevryghem

.github/dependabot.yml

@@ -107,12 +107,27 @@ updates:
     # some classes of supply chain attacks
     cooldown:
       default-days: 7
+    groups:
+      # Group together all GitHub official actions into a single PR
+      github-actions:
+        applies-to: version-updates
+        patterns:
+        - "actions/*"
+        - "github/*"
+    ignore:
+      # For official GitHub actions, ignore minor & patch releases because we reference these actions
+      # via a major version tag which automatically uses the latest minor/patch version (e.g. "actions/checkout@v6")
+      - dependency-name: "actions/*"
+        update-types: [ "version-update:semver-minor", "version-update:semver-patch"]
+      - dependency-name: "github/*"
+        update-types: [ "version-update:semver-minor", "version-update:semver-patch"]
   #####################
-  ## dspace-9_x branch
+  ## dspace-10_x branch
   #####################
   - package-ecosystem: "npm"
     directory: "/"
-    target-branch: dspace-9_x
+    target-branch: dspace-10_x
+    # Monthly dependency updates (NOTE: "schedule" doesn't apply to security updates)
     schedule:
       interval: "monthly"
       time: "05:00"
@@ -124,7 +139,7 @@ updates:
     open-pull-requests-limit: 10
     # Group together Angular package upgrades
     groups:
-      # Group together all patch version updates for Angular in a single PR
+      # Group together all minor/patch version updates for Angular in a single PR
       angular:
         applies-to: version-updates
         patterns:
@@ -138,7 +153,6 @@ updates:
         applies-to: version-updates
         patterns:
         - "@ngrx*"
-        - "@ngtools/webpack"
         update-types:
         - "minor"
         - "patch"
@@ -198,10 +212,10 @@ updates:
       # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
       - dependency-name: "*"
         update-types: ["version-update:semver-major"]
-  # Also automatically update all our GitHub actions on the dspace-9_x branch
+  # Also automatically update all our GitHub actions on the dspace-10_x branch
   - package-ecosystem: "github-actions"
     directory: "/"
-    target-branch: dspace-9_x
+    target-branch: dspace-10_x
     # Monthly dependency updates
     schedule:
       interval: "monthly"
@@ -210,12 +224,26 @@ updates:
     # some classes of supply chain attacks
     cooldown:
       default-days: 7
+    groups:
+      # Group together all GitHub official actions into a single PR
+      github-actions:
+        applies-to: version-updates
+        patterns:
+        - "actions/*"
+        - "github/*"
+    ignore:
+      # For official GitHub actions, ignore minor & patch releases because we reference these actions
+      # via a major version tag which automatically uses the latest minor/patch version (e.g. "actions/checkout@v6")
+      - dependency-name: "actions/*"
+        update-types: [ "version-update:semver-minor", "version-update:semver-patch"]
+      - dependency-name: "github/*"
+        update-types: [ "version-update:semver-minor", "version-update:semver-patch"]
   #####################
-  ## dspace-8_x branch
+  ## dspace-9_x branch
   #####################
   - package-ecosystem: "npm"
     directory: "/"
-    target-branch: dspace-8_x
+    target-branch: dspace-9_x
     schedule:
       interval: "monthly"
       time: "05:00"
@@ -241,6 +269,7 @@ updates:
         applies-to: version-updates
         patterns:
         - "@ngrx*"
+        - "@ngtools/webpack"
         update-types:
         - "minor"
         - "patch"
@@ -300,10 +329,10 @@ updates:
       # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
       - dependency-name: "*"
         update-types: ["version-update:semver-major"]
-  # Also automatically update all our GitHub actions on the dspace-8_x branch
+  # Also automatically update all our GitHub actions on the dspace-9_x branch
   - package-ecosystem: "github-actions"
     directory: "/"
-    target-branch: dspace-8_x
+    target-branch: dspace-9_x
     # Monthly dependency updates
     schedule:
       interval: "monthly"
@@ -312,12 +341,26 @@ updates:
     # some classes of supply chain attacks
     cooldown:
       default-days: 7
+    groups:
+      # Group together all GitHub official actions into a single PR
+      github-actions:
+        applies-to: version-updates
+        patterns:
+        - "actions/*"
+        - "github/*"
+    ignore:
+      # For official GitHub actions, ignore minor & patch releases because we reference these actions
+      # via a major version tag which automatically uses the latest minor/patch version (e.g. "actions/checkout@v6")
+      - dependency-name: "actions/*"
+        update-types: [ "version-update:semver-minor", "version-update:semver-patch"]
+      - dependency-name: "github/*"
+        update-types: [ "version-update:semver-minor", "version-update:semver-patch"]
   #####################
-  ## dspace-7_x branch
+  ## dspace-8_x branch
   #####################
   - package-ecosystem: "npm"
     directory: "/"
-    target-branch: dspace-7_x
+    target-branch: dspace-8_x
     schedule:
       interval: "monthly"
       time: "05:00"
@@ -329,7 +372,7 @@ updates:
     open-pull-requests-limit: 10
     # Group together Angular package upgrades
     groups:
-      # Group together all minor/patch version updates for Angular in a single PR
+      # Group together all patch version updates for Angular in a single PR
       angular:
         applies-to: version-updates
         patterns:
@@ -384,10 +427,18 @@ updates:
         update-types:
         - "minor"
         - "patch"
+      # Group together any webpack related version updates
+      webpack:
+        applies-to: version-updates
+        patterns:
+        - "webpack*"
+        update-types:
+        - "minor"
+        - "patch"
     ignore:
-      # 7.x Cannot update Webpack past v5.76.1 as later versions not supported by Angular 15
-      # See also https://github.com/DSpace/dspace-angular/pull/3283#issuecomment-2372488489
-      - dependency-name: "webpack"
+      # 8.x cannot update sass to v1.100.0 or later as those versions do not support Node v18
+      - dependency-name: "sass"
+        versions: [">=1.100.0"]
       # Restrict zone.js updates to patch level to avoid dependency conflicts with @angular/core
       - dependency-name: "zone.js"
         update-types: ["version-update:semver-major", "version-update:semver-minor"]
@@ -397,10 +448,10 @@ updates:
       # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
       - dependency-name: "*"
         update-types: ["version-update:semver-major"]
-  # Also automatically update all our GitHub actions on the dspace-7_x branch
+  # Also automatically update all our GitHub actions on the dspace-8_x branch
   - package-ecosystem: "github-actions"
     directory: "/"
-    target-branch: dspace-7_x
+    target-branch: dspace-8_x
     # Monthly dependency updates
     schedule:
       interval: "monthly"
@@ -409,3 +460,17 @@ updates:
     # some classes of supply chain attacks
     cooldown:
       default-days: 7
+    groups:
+      # Group together all GitHub official actions into a single PR
+      github-actions:
+        applies-to: version-updates
+        patterns:
+        - "actions/*"
+        - "github/*"
+    ignore:
+      # For official GitHub actions, ignore minor & patch releases because we reference these actions
+      # via a major version tag which automatically uses the latest minor/patch version (e.g. "actions/checkout@v6")
+      - dependency-name: "actions/*"
+        update-types: [ "version-update:semver-minor", "version-update:semver-patch"]
+      - dependency-name: "github/*"
+        update-types: [ "version-update:semver-minor", "version-update:semver-patch"]

.github/workflows/build.yml

@@ -149,7 +149,7 @@ jobs:
       # https://github.com/cypress-io/github-action
       # (NOTE: to run these e2e tests locally, just use 'ng e2e')
       - name: Run e2e tests (integration tests)
-        uses: cypress-io/github-action@v7.1.9
+        uses: cypress-io/github-action@v7.4.0
         with:
           # Run tests in Chrome, headless mode (default)
           browser: chrome

.github/workflows/issue_opened.yml

@@ -16,7 +16,7 @@ jobs:
       # Only add to project board if issue is flagged as "needs triage" or has no labels
       # NOTE: By default we flag new issues as "needs triage" in our issue template
       if: (contains(github.event.issue.labels.*.name, 'needs triage') || join(github.event.issue.labels.*.name) == '')
-      uses: actions/add-to-project@v1.0.2
+      uses: actions/add-to-project@v2
       # Note, the authentication token below is an ORG level Secret. 
       # It must be created/recreated manually via a personal access token with admin:org, project, public_repo permissions
       # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token#permissions-for-the-github_token

.github/workflows/pull_request_opened.yml

@@ -21,4 +21,4 @@ jobs:
     # Assign the PR to whomever created it. This is useful for visualizing assignments on project boards
     # See https://github.com/toshimaru/auto-author-assign
     - name: Assign PR to creator
-      uses: toshimaru/auto-author-assign@v3.0.1
+      uses: toshimaru/auto-author-assign@v3.0.2