allow multiple output locations

ublue-os · Feb 19, 2024 · 31b6b39 · 31b6b39
1 parent 2290aa6
commit 31b6b39
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/.github/workflows/test-iso.yml b/.github/workflows/test-iso.yml
@@ -36,10 +36,6 @@ jobs:
         version: 
           - 38
           - 39
-          - 40
-        include:
-          - version: 40
-            web_ui: 'true'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -53,6 +49,5 @@ jobs:
           IMAGE_TAG: 'latest'
           VARIANT: 'Kinoite'
           VERSION: ${{ matrix.version }}
-          WEB_UI: ${{ matrix.web_ui }}
           ACTION_REPO: ${{ github.repository }}
           ACTION_REF: ${{ github.ref }}
diff --git a/Makefile b/Makefile
@@ -26,13 +26,13 @@ endif
 
 # Step 6: Build end ISO file
 ## Default action
-$(IMAGE_NAME)-$(IMAGE_TAG).iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.txt
+$(IMAGE_NAME)-$(IMAGE_TAG).iso: output/$(IMAGE_NAME)-$(IMAGE_TAG).iso
+	mv output/$(IMAGE_NAME)-$(IMAGE_TAG).iso $(IMAGE_NAME)-$(IMAGE_TAG).iso
+
+output/$(IMAGE_NAME)-$(IMAGE_TAG).iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.txt
 	mkdir $(_BASE_DIR)/output
 	xorriso -dialog on < $(_BASE_DIR)/xorriso/input.txt
 
-output/$(IMAGE_NAME)-$(IMAGE_TAG).iso: $(IMAGE_NAME)-$(IMAGE_TAG).iso
-	cp $(IMAGE_NAME)-$(IMAGE_TAG).iso output/$(IMAGE_NAME)-$(IMAGE_TAG).iso
-
 # Step 2: Build boot.iso using Lorax
 boot.iso: lorax_templates/set_installer.tmpl lorax_templates/configure_upgrades.tmpl
 	rm -Rf $(_BASE_DIR)/results