From 7479ca42598fbc0bfaa3a726120a9c04389b153c Mon Sep 17 00:00:00 2001
From: Timo Furrer <tfurrer@gitlab.com>
Date: Fri, 26 Jan 2024 10:11:01 +0100
Subject: [PATCH] Fix backports
---
Makefile | 2 +-
backports/OpenTofu/Base.latest.gitlab-ci.yml | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index b0ee1e9..62a8d4f 100644
--- a/Makefile
+++ b/Makefile
@@ -46,6 +46,6 @@ backports:
@sed -i $(BACKPORTS_BASE_FILE) -e '/TF_ROOT: $$TF_ROOT/d'
@# Remove empty variable blocks - yq doesn't preserve white spaces, thus the patching ...
- @yq e 'del(.*.variables | select(length==0))' backports/OpenTofu/Base.gitlab-ci.yml | diff -Bw backports/OpenTofu/Base.gitlab-ci.yml - | patch backports/OpenTofu/Base.gitlab-ci.yml -
+ @yq e 'del(.*.variables | select(length==0))' $(BACKPORTS_BASE_FILE) | diff -Bw $(BACKPORTS_BASE_FILE) - | patch $(BACKPORTS_BASE_FILE) -
@echo "Generated $(BACKPORTS_BASE_FILE)"
diff --git a/backports/OpenTofu/Base.latest.gitlab-ci.yml b/backports/OpenTofu/Base.latest.gitlab-ci.yml
index c3be678..08cf007 100644
--- a/backports/OpenTofu/Base.latest.gitlab-ci.yml
+++ b/backports/OpenTofu/Base.latest.gitlab-ci.yml
@@ -65,7 +65,6 @@ variables:
key: "$TF_ROOT"
paths:
- $TF_ROOT/.terraform/
- variables:
image:
name: '$GITLAB_OPENTOFU_IMAGE_REGISTRY_BASE/gitlab-opentofu:$GITLAB_OPENTOFU_VERSION-opentofu$OPENTOFU_VERSION'
script:
@@ -82,7 +81,6 @@ variables:
key: "$TF_ROOT"
paths:
- $TF_ROOT/.terraform/
- variables:
image:
name: '$GITLAB_OPENTOFU_IMAGE_REGISTRY_BASE/gitlab-opentofu:$GITLAB_OPENTOFU_VERSION-opentofu$OPENTOFU_VERSION'
script:
@@ -115,7 +113,6 @@ variables:
key: "$TF_ROOT"
paths:
- $TF_ROOT/.terraform/
- variables:
image:
name: '$GITLAB_OPENTOFU_IMAGE_REGISTRY_BASE/gitlab-opentofu:$GITLAB_OPENTOFU_VERSION-opentofu$OPENTOFU_VERSION'
script:
@@ -136,7 +133,6 @@ variables:
key: "$TF_ROOT"
paths:
- $TF_ROOT/.terraform/
- variables:
image:
name: '$GITLAB_OPENTOFU_IMAGE_REGISTRY_BASE/gitlab-opentofu:$GITLAB_OPENTOFU_VERSION-opentofu$OPENTOFU_VERSION'
script:
@@ -155,7 +151,6 @@ variables:
key: "$TF_ROOT"
paths:
- $TF_ROOT/.terraform/
- variables:
image:
name: '$GITLAB_OPENTOFU_IMAGE_REGISTRY_BASE/gitlab-opentofu:$GITLAB_OPENTOFU_VERSION-opentofu$OPENTOFU_VERSION'
script:
--
GitLab