From 7891524633eba8cc151c21b340186f23a0a91d9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20Houl=C3=A9?= <tom@tomhoule.com>
Date: Tue, 21 Dec 2021 14:23:53 +0100
Subject: [PATCH 1/2] Prepare master -> main

---
 .github/workflows/build-wasm.yml       | 2 +-
 .github/workflows/cargo-doc.yml        | 2 +-
 .github/workflows/formatting.yml       | 2 +-
 .github/workflows/migration-engine.yml | 2 +-
 .github/workflows/query-engine.yml     | 2 +-
 .github/workflows/unit-tests.yml       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-wasm.yml b/.github/workflows/build-wasm.yml
index 3e2f27151ebe..8a71d8eaa83a 100644
--- a/.github/workflows/build-wasm.yml
+++ b/.github/workflows/build-wasm.yml
@@ -2,7 +2,7 @@ name: WASM build
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 jobs:
   build:
diff --git a/.github/workflows/cargo-doc.yml b/.github/workflows/cargo-doc.yml
index cc27cd3e416b..02a5a2d9193f 100644
--- a/.github/workflows/cargo-doc.yml
+++ b/.github/workflows/cargo-doc.yml
@@ -4,7 +4,7 @@ on:
     inputs: # null
   push:
     branches:
-      - master
+      - main
 jobs:
   generate-cargo-docs:
     name: "Generate cargo docs for the workspace"
diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml
index d254b5538890..c978d95be987 100644
--- a/.github/workflows/formatting.yml
+++ b/.github/workflows/formatting.yml
@@ -2,7 +2,7 @@ name: Formatting
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 jobs:
   clippy:
diff --git a/.github/workflows/migration-engine.yml b/.github/workflows/migration-engine.yml
index dc5a81dd353c..dd99addad482 100644
--- a/.github/workflows/migration-engine.yml
+++ b/.github/workflows/migration-engine.yml
@@ -2,7 +2,7 @@ name: Introspection Engine + Migration Engine + sql_schema_describer
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 jobs:
   test-mongodb-introspection-and-migration-connector:
diff --git a/.github/workflows/query-engine.yml b/.github/workflows/query-engine.yml
index defcb8329c43..8941b00fbfde 100644
--- a/.github/workflows/query-engine.yml
+++ b/.github/workflows/query-engine.yml
@@ -2,7 +2,7 @@ name: Query Engine
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 jobs:
   rust-vitess-tests:
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index d923e45814f0..fb782f1cbb16 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -2,7 +2,7 @@ name: Unit tests
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 jobs:
   test:

From 4871f62d2205b052ecaef0be10015c77fa4bf7b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20Houl=C3=A9?= <tom@tomhoule.com>
Date: Tue, 4 Jan 2022 12:52:56 +0100
Subject: [PATCH 2/2] Update engineer

This is the version that publishes `main`
---
 .buildkite/engineer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/engineer b/.buildkite/engineer
index f9b2b26c055f..c9f1e2e83c09 100755
--- a/.buildkite/engineer
+++ b/.buildkite/engineer
@@ -13,7 +13,7 @@ fi
 if ! type "engineer" > /dev/null; then
     # Setup Prisma engine build & test tool (engineer).
     set -e
-    curl --fail -sSL "https://prisma-engineer.s3-eu-west-1.amazonaws.com/1.32/latest/$OS/engineer.gz" --output engineer.gz
+    curl --fail -sSL "https://prisma-engineer.s3-eu-west-1.amazonaws.com/1.33/latest/$OS/engineer.gz" --output engineer.gz
     gzip -d engineer.gz
     chmod +x engineer