chore: move buildkite folder + fix publish (#8531)

* chore: move buildkite folder * remove src from buildkite config * chore: fix publish
prisma · Aug 2, 2021 · d9d1649 · d9d1649
1 parent 0d0dc83
commit d9d1649
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/src/.buildkite/publish/buildkite-entry.sh → .buildkite/publish/buildkite-entry.sh b/src/.buildkite/publish/buildkite-entry.sh → .buildkite/publish/buildkite-entry.sh
@@ -25,7 +25,7 @@ echo $BUILDKITE_SOURCE
 echo $UPDATE_STUDIO
 
 if [ $CHANGED_COUNT -gt 0 ] || [ $BUILDKITE_TAG ] || [ $BUILDKITE_SOURCE == "trigger_job" ] || [ $UPDATE_STUDIO ]; then
-  buildkite-agent pipeline upload src/.buildkite/publish/publish.yml
+  buildkite-agent pipeline upload .buildkite/publish/publish.yml
 else
   echo "Nothing changed"
 fi
diff --git a/src/.buildkite/publish/docker-compose.yml → .buildkite/publish/docker-compose.yml b/src/.buildkite/publish/docker-compose.yml → .buildkite/publish/docker-compose.yml
@@ -3,9 +3,9 @@ services:
   app:
     image: node:12-buster
     volumes:
-      - ../../../:/app
+      - ../../:/app
     working_dir: /app
-    command: /app/src/.buildkite/publish/run.sh
+    command: /app/.buildkite/publish/run.sh
     environment:
       # PostgreSQL
       - TEST_POSTGRES_URI_MIGRATE=postgres://prisma:prisma@postgres:5432/tests-migrate

diff --git a/src/.buildkite/publish/publish.yml → .buildkite/publish/publish.yml b/src/.buildkite/publish/publish.yml → .buildkite/publish/publish.yml
@@ -3,6 +3,6 @@ steps:
     timeout_in_minutes: 45
     plugins:
       - docker-compose#v3.8.0:
-          config: src/.buildkite/publish/docker-compose.yml
+          config: .buildkite/publish/docker-compose.yml
           run: app
   - wait
diff --git a/src/.buildkite/publish/run.sh → .buildkite/publish/run.sh b/src/.buildkite/publish/run.sh → .buildkite/publish/run.sh
diff --git a/src/.buildkite/test/buildkite-entry.sh → .buildkite/test/buildkite-entry.sh b/src/.buildkite/test/buildkite-entry.sh → .buildkite/test/buildkite-entry.sh
@@ -23,7 +23,7 @@ echo $BUILDKITE_TAG
 echo $CHANGED_COUNT
 
 if [ $CHANGED_COUNT -gt 0 ]; then
-  buildkite-agent pipeline upload src/.buildkite/test/test.yml
+  buildkite-agent pipeline upload .buildkite/test/test.yml
 else
   echo "Nothing changed"
 fi

diff --git a/src/.buildkite/test/docker-compose.14.yml → .buildkite/test/docker-compose.14.yml b/src/.buildkite/test/docker-compose.14.yml → .buildkite/test/docker-compose.14.yml
@@ -3,9 +3,9 @@ services:
   app:
     image: node:14-buster
     volumes:
-      - ../../../:/app
+      - ../../:/app
     working_dir: /app
-    command: /app/src/.buildkite/test/run.sh
+    command: /app/.buildkite/test/run.sh
     environment:
       # PostgreSQL
       - TEST_POSTGRES_URI_MIGRATE=postgres://prisma:prisma@postgres:5432/tests-migrate

diff --git a/src/.buildkite/test/run.sh → .buildkite/test/run.sh b/src/.buildkite/test/run.sh → .buildkite/test/run.sh
diff --git a/src/.buildkite/test/test.yml → .buildkite/test/test.yml b/src/.buildkite/test/test.yml → .buildkite/test/test.yml
@@ -4,7 +4,7 @@ steps:
     timeout_in_minutes: 25
     plugins:
       - docker-compose#v3.8.0:
-          config: src/.buildkite/test/docker-compose.14.yml
+          config: .buildkite/test/docker-compose.14.yml
           run: app
 
   - wait
diff --git a/scripts/ci/publish.ts b/scripts/ci/publish.ts
@@ -515,15 +515,15 @@ async function getNextMinorStable() {
 }
 
 // TODO: Adjust this for stable release
-function getMinorFromPatchBranch(version: string) {
+function getMinorFromPatchBranch(version: string): number | null {
   const regex = /2\.(\d+)\.x/
   const match = regex.exec(version)
 
   if (match) {
     return Number(match[1])
   }
 
-  return undefined
+  return null
 }
 
 async function publish() {