From 9dc735bad5491767fa0e6a2ee8eee4e8f1d16d61 Mon Sep 17 00:00:00 2001
From: Robert Prehn <3952444+prehnRA@users.noreply.github.com>
Date: Sat, 16 Jan 2021 13:12:26 -0600
Subject: [PATCH 1/2] fix: Switch to single manifest with .yaml extension

---
 infrastructure/{kube.yml => kube.yaml}                   | 0
 infrastructure_templates/{kube.yml.dot => kube.yaml.dot} | 0
 script/generate-kube                                     | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename infrastructure/{kube.yml => kube.yaml} (100%)
 rename infrastructure_templates/{kube.yml.dot => kube.yaml.dot} (100%)

diff --git a/infrastructure/kube.yml b/infrastructure/kube.yaml
similarity index 100%
rename from infrastructure/kube.yml
rename to infrastructure/kube.yaml
diff --git a/infrastructure_templates/kube.yml.dot b/infrastructure_templates/kube.yaml.dot
similarity index 100%
rename from infrastructure_templates/kube.yml.dot
rename to infrastructure_templates/kube.yaml.dot
diff --git a/script/generate-kube b/script/generate-kube
index 99b51c94..9e826c40 100755
--- a/script/generate-kube
+++ b/script/generate-kube
@@ -12,4 +12,4 @@ var packageConfig = JSON.parse(packageText);
 const {version} = packageConfig;
 const manifestText = dots.kube({version: version});
 
-fs.writeFileSync("infrastructure/kube.yml", manifestText);
+fs.writeFileSync("infrastructure/kube.yaml", manifestText);

From 38fc40828c0a7572f1da2df3124d1f2e978060db Mon Sep 17 00:00:00 2001
From: Robert Prehn <3952444+prehnRA@users.noreply.github.com>
Date: Sat, 16 Jan 2021 13:20:27 -0600
Subject: [PATCH 2/2] fix: Only build docker image if needed

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5eda14e..91026ff8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,6 +28,8 @@ build_image_for_commit:
   stage: test
   needs: []
   image: "docker:19.03.12"
+  only:
+    - master
   services:
     - name: docker:19.03.12-dind
   script: