From 62c5423ee7f78d933c51b7dd8c9dbb25e22defa9 Mon Sep 17 00:00:00 2001
From: "Jason N." <33561705+JasonN3@users.noreply.github.com>
Date: Wed, 13 Mar 2024 11:23:58 -0400
Subject: [PATCH] revert conditionals

---
 .github/workflows/build-and-test.yml |  5 +++++
 Makefile                             | 22 ++++++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 7419361..7d67cdd 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -8,6 +8,11 @@ on:
       - 'v*'
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+    
+
 # Test Values
 env:
   ARCH: 'x86_64'
diff --git a/Makefile b/Makefile
index eafbaa3..e72c0bd 100644
--- a/Makefile
+++ b/Makefile
@@ -161,9 +161,10 @@ boot.iso: lorax_repo $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(_REPO_FIL
 	mv /etc/rpm/macros.image-language-conf $(_TEMP_DIR)/macros.image-language-conf || true
 
 	# Download the secure boot key
-ifneq ($(SECURE_BOOT_KEY_URL),)
-    	curl --fail -L -o $(_BASE_DIR)/sb_pubkey.der $(SECURE_BOOT_KEY_URL)
-endif
+	if [ -n "$(SECURE_BOOT_KEY_URL)" ]; \
+	then \
+    	curl --fail -L -o $(_BASE_DIR)/sb_pubkey.der $(SECURE_BOOT_KEY_URL); \
+	fi
 
 	lorax -p $(IMAGE_NAME) -v $(VERSION) -r $(VERSION) -t $(VARIANT) \
 		--isfinal --squashfs-only --buildarch=$(ARCH) --volid=$(_VOLID) --sharedir $(_BASE_DIR)/external/lorax/share/templates.d/99-generic \
@@ -235,13 +236,14 @@ test-iso:
 	done
 
 	# flapak tests
-ifneq ($(FLATPAK_REMOTE_REFS),)
-	chmod +x $(foreach test,$(filter flatpak_%,$(_TESTS)),tests/iso/$(test))
-	for test in $(_TESTS); \
-	do \
-	$(foreach var,$(_VARS),$(var)=$($(var))) ./tests/iso/$${test}; \
-	done
-endif
+	if [ -n "$(FLATPAK_REMOTE_REFS)" ]; \
+	then \
+		chmod +x $(foreach test,$(filter flatpak_%,$(_TESTS)),tests/iso/$(test)); \
+		for test in $(_TESTS); \
+		do \
+		$(foreach var,$(_VARS),$(var)=$($(var))) ./tests/iso/$${test}; \
+		done; \
+	fi
 
 	# Cleanup
 	sudo umount /mnt/install