chore(EMS-4089): merge main into main-iterations-2 (#3445)

* chore(EMS-3966): update dependabot to run during non working hours (#3278) * chore(EMS-3966): update dependabot to run during non working hours * chore(EMS-3966): update dependabot to run weekly * chore(EMS-3966): update dependabot to run weekly * chore(EMS-3966): update dependabot to run monthly * fix(EMS-3988): quote tool - type of policy - hint text * chore(main): release 2.36.1 (#3300) * fix(EMS-3988): regenerate api schema (#3301) * chore(main): release 2.36.2 (#3302) * fix(EMS-3988): apply - type of policy - hint text (#3305) * chore(main): release 2.36.3 (#3306) * chore(deps): bump dependencies * chore(EMS-4019): account creation/sign in checks - dev environment (#3345) * chore(EMS-4019): account creation/sign in checks - dev environment * chore(EMS-4019): remove commented code * chore(EMS-4019): update afterAll * chore(tests): fix failing date test * chore(EMS-4031): test dependabot changes (#3350) * chore(EMS-4031): added restriction to package verions in package.jsons * chore(EMS-4031): updated package.lock.json * chore(EMS-4031): change to 1600 * chore(EMS-4031): revert package.json and add ignores to dependabot.yml * chore(EMS-4031): add ignores to dependabot.yml * chore(EMS-4031): changed dependabot time * chore(EMS-4031): add ignores to dependabot.yml (#3388) * chore(EMS-4031): add ignores to dependabot.yml (#3398) Co-authored-by: Zain Kassam <zkassam@ukexportfinance.gov.uk> * chore(EMS-4031): reverts timing changes to dependabot.yml * chore(deps): bump dependencies * chore(EMS-4031): combine dependabot directories into 1 * chore(deps): bump dependencies * chore(EMS-4031): changed dependabot npm schedule to monthly (#3429) Co-authored-by: Zain Kassam <zkassam@ukexportfinance.gov.uk> * chore(deps): remove mysql2 * chore(deps): bump dockerfile node alpine version --------- Co-authored-by: Abhi Markan <32125108+abhi-markan@users.noreply.github.com> Co-authored-by: zainZzKk <51957827+Zainzzkk@users.noreply.github.com> Co-authored-by: Zain Kassam <zkassam@ukexportfinance.gov.uk>
UK-Export-Finance · Jan 6, 2025 · 6516915 · 6516915
1 parent 3cbbe96
commit 6516915
Show file tree

Hide file tree

Showing 10 changed files with 1,045 additions and 995 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,57 +10,56 @@ version: 2
 updates:
   # Root package-*.json files
   - package-ecosystem: 'npm'
-    directory: '/'
-    schedule:
-      interval: 'monthly'
-      time: '03:00'
-    labels:
-      - 'chore'
-
-  # `API` package-*.json files
-  - package-ecosystem: 'npm'
-    directory: '/src/api'
-    schedule:
-      interval: 'monthly'
-      time: '03:00'
-    labels:
-      - 'chore'
-
-  # `UI` package-*.json files
-  - package-ecosystem: 'npm'
-    directory: '/src/ui'
-    schedule:
-      interval: 'monthly'
-      time: '03:00'
-    labels:
-      - 'chore'
-
-  # `generate-exip-pricing-grid` package-*.json files
-  - package-ecosystem: 'npm'
-    directory: '/generate-exip-pricing-grid'
-    schedule:
-      interval: 'monthly'
-      time: '03:00'
-    labels:
-      - 'chore'
-
-  # `API` Dockerfile
-  - package-ecosystem: 'docker'
-    directory: '/src/api'
+    directories:
+      - '/'
+      - 'src/api'
+      - '/src/ui'
+      - '/generate-exip-pricing-grid'
     schedule:
       interval: 'monthly'
       time: '03:00'
     labels:
       - 'chore'
+    ignore:
+      - dependency-name: "@keystone-6/core"
+        versions: [">=6.0.0"]
+      - dependency-name: "@keystone-6/auth"
+        versions: [">=8.0.0"]
+      - dependency-name: "@keystone-6/fields-document"
+        versions: [">=9.0.0"]
+      - dependency-name: "@typescript-eslint/parser"
+        versions: [">=8.0.0"]
+      - dependency-name: "@typescript-eslint/eslint-plugin"
+        versions: [">=8.0.0"]
+      - dependency-name: "graphql"
+        versions: [">=16.0.0"]
+      - dependency-name: "eslint"
+        versions: [">=9.0.0"]
+      - dependency-name: "eslint-plugin-cypress"
+        versions: [">=4.0.0"]
+      - dependency-name: "eslint-plugin-prettier"
+        versions: [">=5.0.0"]
+      - dependency-name: "prettier"
+        versions: [">=3.0.0"]
+    groups:
+      npm-packages:
+        patterns:
+          - '*'
 
-  # `UI` Dockerfile
+  # `UI and API` Dockerfile
   - package-ecosystem: 'docker'
-    directory: '/src/ui'
+    directories:
+      - 'src/api'
+      - '/src/ui'
     schedule:
       interval: 'monthly'
       time: '03:00'
     labels:
       - 'chore'
+    groups:
+      docker-packages:
+        patterns:
+          - '*'
 
   # Git Hub Actions
   #  Set the directory to `/` for
@@ -72,3 +71,7 @@ updates:
       time: '03:00'
     labels:
       - 'chore'
+    groups:
+      github-actions:
+        patterns:
+          - '*'
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -111,7 +111,7 @@ jobs:
         run: npm run test
 
       - name: Coverage
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           flags: unit-test
@@ -180,7 +180,7 @@ jobs:
           npm run test --prefix ./src/api
 
       - name: Coverage
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           flags: api-test