From 3d6bd466076db44bd1272ac14711beb46efbf093 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Aug 2026 21:46:50 +0000
Subject: [PATCH 1/2] chore(deps): bump @google-cloud/dataform from 2.4.0 to
 2.5.0

Bumps [@google-cloud/dataform](https://github.com/googleapis/google-cloud-node/tree/HEAD/packages/google-cloud-dataform) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/googleapis/google-cloud-node/releases)
- [Changelog](https://github.com/googleapis/google-cloud-node/blob/main/packages/google-cloud-dataform/CHANGELOG.md)
- [Commits](https://github.com/googleapis/google-cloud-node/commits/tpu-v2.5.0/packages/google-cloud-dataform)

---
updated-dependencies:
- dependency-name: "@google-cloud/dataform"
  dependency-version: 2.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apps/dataform-service/package.json |  2 +-
 package-lock.json                  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/dataform-service/package.json b/apps/dataform-service/package.json
index c249bac..2d09b0a 100644
--- a/apps/dataform-service/package.json
+++ b/apps/dataform-service/package.json
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@google-cloud/bigquery": "8.1.1",
-    "@google-cloud/dataform": "2.4.0",
+    "@google-cloud/dataform": "2.5.0",
     "@google-cloud/functions-framework": "^5.0.1",
     "@google-cloud/run": "3.3.0",
     "@google-cloud/storage": "7.21.0",
diff --git a/package-lock.json b/package-lock.json
index 9abe928..313c4da 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -84,7 +84,7 @@
       "version": "1.0.0",
       "dependencies": {
         "@google-cloud/bigquery": "8.1.1",
-        "@google-cloud/dataform": "2.4.0",
+        "@google-cloud/dataform": "^2.5.0",
         "@google-cloud/functions-framework": "^5.0.1",
         "@google-cloud/run": "3.3.0",
         "@google-cloud/storage": "7.21.0",
@@ -871,15 +871,15 @@
       }
     },
     "node_modules/@google-cloud/dataform": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@google-cloud/dataform/-/dataform-2.4.0.tgz",
-      "integrity": "sha512-+R/mHCDEWTxFVKdgNRThQ7owv1I4JWvBQcjo5sUF0GVDF99A2JP+8ENIW5OON9Dad4S+pQf8q5oEabBfEpX4+w==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@google-cloud/dataform/-/dataform-2.5.0.tgz",
+      "integrity": "sha512-2iRWfeyNLxTOH/2DcoJ/wYv/tD1wKtZcQe4Qe5zv89kGMlmQtzWoQm7Jkc1vzKiz5XElJ5BDI1Qx7PTBSGCgmQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "google-gax": "^5.0.0"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=18"
       }
     },
     "node_modules/@google-cloud/firestore": {

From 4e249c47e19c5c24c4fcaf2ba3a594b1fa6a134f Mon Sep 17 00:00:00 2001
From: Max Ostapenko <1611259+max-ostapenko@users.noreply.github.com>
Date: Sun, 2 Aug 2026 00:00:07 +0200
Subject: [PATCH 2/2] fix: disable auto-merge for Dependabot PRs to perform
 immediate squash merge

Signed-off-by: Max Ostapenko <1611259+max-ostapenko@users.noreply.github.com>
---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2f69273..ba51c7d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -36,7 +36,7 @@ jobs:
 
       - name: Enable auto-merge for Dependabot PRs
         if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor'
-        run: gh pr merge --auto --squash "$PR_URL"
+        run: gh pr merge --squash "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GH_TOKEN: ${{secrets.GITHUB_TOKEN}}