From e741cc659d78ccfd2ed605453de43bc77cdf067f Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Fri, 7 Jul 2023 16:55:42 +0300 Subject: [PATCH 1/7] chore: use dependabot groups See https://github.blog/changelog/2023-06-30-grouped-version-updates-for-dependabot-public-beta/ for details This will reduce the number of dependabot PRs For go and node dependencies, I leave the exact grouping to engineers who better know which one and how should be grouped. --- .github/dependabot.yaml | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 8a94804555357..7326f132a87d3 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -24,7 +24,11 @@ updates: update-types: - version-update:semver-minor - version-update:semver-patch - + groups: + github-actions: + patterns: + - "*" + - package-ecosystem: "gomod" directory: "/" schedule: @@ -39,6 +43,10 @@ updates: - dependency-name: "*" update-types: - version-update:semver-patch + groups: + go: + patterns: + - "*" # Update our Dockerfile. - package-ecosystem: "docker" @@ -54,7 +62,10 @@ updates: # We need to coordinate terraform updates with the version hardcoded in # our Go code. - dependency-name: "terraform" - + groups: + docker: + patterns: + - "*" - package-ecosystem: "npm" directory: "/site/" schedule: @@ -76,7 +87,11 @@ updates: - dependency-name: "@types/node" update-types: - version-update:semver-major - + groups: + site: + patterns: + - "*" + - package-ecosystem: "terraform" directory: "/examples/templates" schedule: @@ -89,7 +104,11 @@ updates: ignore: # We likely want to update this ourselves. - dependency-name: "coder/coder" - + groups: + terraform: + patterns: + - "*" + # Update dogfood. - package-ecosystem: "docker" directory: "/dogfood/" @@ -99,7 +118,10 @@ updates: timezone: "America/Chicago" commit-message: prefix: "chore" - labels: [] + groups: + docker: + patterns: + - "*" - package-ecosystem: "terraform" directory: "/dogfood/" @@ -110,5 +132,8 @@ updates: commit-message: prefix: "chore" labels: [] - ignore: - - dependency-name: "coder/coder" + groups: + terraform: + patterns: + - "*" + From 9bf47c2ec6314dcd3c49b6d0c40744b9f3e02f1b Mon Sep 17 00:00:00 2001 From: Atif Ali Date: Fri, 7 Jul 2023 14:00:23 +0000 Subject: [PATCH 2/7] make fmt --- .github/dependabot.yaml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 7326f132a87d3..428c6179acf3b 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -27,8 +27,8 @@ updates: groups: github-actions: patterns: - - "*" - + - "*" + - package-ecosystem: "gomod" directory: "/" schedule: @@ -65,7 +65,7 @@ updates: groups: docker: patterns: - - "*" + - "*" - package-ecosystem: "npm" directory: "/site/" schedule: @@ -90,8 +90,8 @@ updates: groups: site: patterns: - - "*" - + - "*" + - package-ecosystem: "terraform" directory: "/examples/templates" schedule: @@ -107,8 +107,8 @@ updates: groups: terraform: patterns: - - "*" - + - "*" + # Update dogfood. - package-ecosystem: "docker" directory: "/dogfood/" @@ -119,9 +119,9 @@ updates: commit-message: prefix: "chore" groups: - docker: - patterns: - - "*" + docker: + patterns: + - "*" - package-ecosystem: "terraform" directory: "/dogfood/" @@ -135,5 +135,4 @@ updates: groups: terraform: patterns: - - "*" - + - "*" From 509d7ac52f5d89487f06ad5eb1e14cdc66306ce9 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Fri, 7 Jul 2023 18:05:27 +0300 Subject: [PATCH 3/7] group only otel for go remove grouping for node --- .github/dependabot.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 428c6179acf3b..335899a1e8cdf 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -24,10 +24,6 @@ updates: update-types: - version-update:semver-minor - version-update:semver-patch - groups: - github-actions: - patterns: - - "*" - package-ecosystem: "gomod" directory: "/" @@ -44,9 +40,10 @@ updates: update-types: - version-update:semver-patch groups: - go: + otel: patterns: - - "*" + - "go.nhat.io/otelsql" + - "go.opentelemetry.io/otel*" # Update our Dockerfile. - package-ecosystem: "docker" From 5b0e4c4ecb386984707afb4a4c1575c0bb517079 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Fri, 7 Jul 2023 18:58:17 +0300 Subject: [PATCH 4/7] better name groups and remove npm group --- .github/dependabot.yaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 335899a1e8cdf..34ab892e21300 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -24,6 +24,10 @@ updates: update-types: - version-update:semver-minor - version-update:semver-patch + groups: + github-actions: + patterns: + - "*" - package-ecosystem: "gomod" directory: "/" @@ -40,7 +44,7 @@ updates: update-types: - version-update:semver-patch groups: - otel: + go-otel: patterns: - "go.nhat.io/otelsql" - "go.opentelemetry.io/otel*" @@ -63,6 +67,7 @@ updates: docker: patterns: - "*" + - package-ecosystem: "npm" directory: "/site/" schedule: @@ -84,10 +89,6 @@ updates: - dependency-name: "@types/node" update-types: - version-update:semver-major - groups: - site: - patterns: - - "*" - package-ecosystem: "terraform" directory: "/examples/templates" @@ -102,7 +103,7 @@ updates: # We likely want to update this ourselves. - dependency-name: "coder/coder" groups: - terraform: + examples-terraform: patterns: - "*" @@ -116,7 +117,7 @@ updates: commit-message: prefix: "chore" groups: - docker: + dogfood-docker: patterns: - "*" @@ -130,6 +131,6 @@ updates: prefix: "chore" labels: [] groups: - terraform: + dogfood-terraform: patterns: - "*" From 27ff65e5987522c22fa39f6e2656e1d694035261 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Fri, 7 Jul 2023 19:02:01 +0300 Subject: [PATCH 5/7] add back empty labels --- .github/dependabot.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 34ab892e21300..bb2967c387fc5 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -116,6 +116,7 @@ updates: timezone: "America/Chicago" commit-message: prefix: "chore" + labels: [] groups: dogfood-docker: patterns: From 8f357f1a76a8afac356f053c7de12c9b8922d829 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Fri, 7 Jul 2023 19:16:10 +0300 Subject: [PATCH 6/7] ignore coder/coder for dogfood Also removing the group for dogfood-docker as we only have a docker provider so nothing really to group here. --- .github/dependabot.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index bb2967c387fc5..760f26d723f5f 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -131,7 +131,7 @@ updates: commit-message: prefix: "chore" labels: [] - groups: - dogfood-terraform: - patterns: - - "*" + ignore: + # We likely want to update this ourselves. + - dependency-name: "coder/coder" + From 51ca505c8f5d6f22bd518e4016fcb4d7327b2e7e Mon Sep 17 00:00:00 2001 From: Atif Ali Date: Fri, 7 Jul 2023 16:19:47 +0000 Subject: [PATCH 7/7] make fmt --- .github/dependabot.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 760f26d723f5f..fb5828a99ebf4 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -67,7 +67,7 @@ updates: docker: patterns: - "*" - + - package-ecosystem: "npm" directory: "/site/" schedule: @@ -134,4 +134,3 @@ updates: ignore: # We likely want to update this ourselves. - dependency-name: "coder/coder" -