From 047b9d6e50cf48cbc46e1bd913a2984045b69938 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sun, 4 Dec 2022 09:40:10 +0000
Subject: [PATCH] ci(gitlab-ci): Adjust compare branch from variable to
 absolute value

It seems like the variable is not picked up properly and as a result
it doesn't work as expected.
---
 apps/k8s01/mastodon/mastodon-values.yaml | 6 +++---
 charts/.utils/gitlab-ci.yaml             | 2 +-
 images/.utils/gitlab-ci.yaml             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/k8s01/mastodon/mastodon-values.yaml b/apps/k8s01/mastodon/mastodon-values.yaml
index 9320e8860..f9fe77d4f 100644
--- a/apps/k8s01/mastodon/mastodon-values.yaml
+++ b/apps/k8s01/mastodon/mastodon-values.yaml
@@ -5,15 +5,15 @@ metadata:
     namespace: mastodon
 type: Opaque
 stringData:
-    values-overrides.yaml: ENC[AES256_GCM,data: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,iv:s4UxGg6+VOQnyRYWt6Q/P48asIYNv9c6h5hKACfgU4o=,tag:/KlCl67lLbraQuFN+W2A9A==,type:str]
+    values-overrides.yaml: ENC[AES256_GCM,data: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,iv:ehXfAOMSZ76DJ1E2yUWIxIbSEQQeA+HNWMHBjDIIabI=,tag:lEqkgkdtuW7WDwkvgCtfxg==,type:str]
 sops:
     kms: []
     gcp_kms: []
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-11-15T11:42:13Z"
-    mac: ENC[AES256_GCM,data:ElSyQzge2CJhe/QorwXxZiqTT5LC9HW3zEDxU0fiwES1ihibU8GySUoXsDHUlDVHOkH5JftEGy5KZOfvaA9XYZw8IR13qaCxMlp+te7IeZqbXG/aeC6dlfo7S7kWXayEIOeV4gnmxph0j/93e8sqK9F+OdXS6hw5JpdJxPV5LhE=,iv:xFEuHREJoYPIT6sMp9V3JANz29LtrhmGD/q5d/Oc684=,tag:4lxbcZzYq0ZMU0AI7Rv/2A==,type:str]
+    lastmodified: "2022-12-04T09:50:55Z"
+    mac: ENC[AES256_GCM,data:PidjnZ9BkiyPHRgQjV6kN8DcBAGzja8swaEw9YhGDy1eHeFXqsezovXdjP0J5pRHnVSwxUMBMAI2vVtQC7cjNANkLTtVnsu4s8yXHMnWlJGXYlivkgBe0g0o/Y9ueBkR68s/+Q7QTmrMeuorRR8yWWrAGh5oZPtwZ2VD03e3LiM=,iv:BnPxi8SneeQ1vWuM9vHUhq19oaWzFlDPr5fiGrtEZzo=,tag:8RMyhmQFWN7JN/Hyb/D+yQ==,type:str]
     pgp:
         - created_at: "2022-03-22T22:26:35Z"
           enc: |-
diff --git a/charts/.utils/gitlab-ci.yaml b/charts/.utils/gitlab-ci.yaml
index 48f5fae73..5a8229880 100644
--- a/charts/.utils/gitlab-ci.yaml
+++ b/charts/.utils/gitlab-ci.yaml
@@ -38,4 +38,4 @@ chart-helm-unittest:
       changes:
         paths:
           - charts/${CHART}/**/*
-        compare_to: $CI_DEFAULT_BRANCH
+        compare_to: main
diff --git a/images/.utils/gitlab-ci.yaml b/images/.utils/gitlab-ci.yaml
index 32accce50..ee56ffe8f 100644
--- a/images/.utils/gitlab-ci.yaml
+++ b/images/.utils/gitlab-ci.yaml
@@ -57,6 +57,6 @@ container-build-dev:
         paths:
           - images/${IMAGE}/**/*
           - images/.utils/*
-        compare_to: $CI_DEFAULT_BRANCH
+        compare_to: main
   tags:
     - hetzner
-- 
GitLab