[neon/ubuntu-core] /: Switch the main targets to produce ISO files

[Kevin Ottens]

Git commit a1d22e659eac4b75e4a4b5226bd614ccd676f4e4 by Kevin Ottens.
Committed on 12/08/2024 at 16:51.
Pushed by ervin into branch 'master'.

Switch the main targets to produce ISO files

M  +2    -6    Makefile
M  +1    -1    debian/neon-core-image-dangerous.yml
M  +1    -1    debian/neon-core-image-signed.yml

https://invent.kde.org/neon/ubuntu-core/-/commit/a1d22e659eac4b75e4a4b5226bd614ccd676f4e4

diff --git a/Makefile b/Makefile
index 660c8e0..47a69b9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,8 @@
 all: dangerous signed
 
-dangerous: kde-neon-core-dangerous-amd64.tar.gz
+dangerous: kde-neon-core-dangerous-amd64.iso
 
-dangerous-iso: kde-neon-core-dangerous-amd64.iso
-
-signed: kde-neon-core-signed-amd64.tar.gz
-
-signed-iso: kde-neon-core-signed-amd64.iso
+signed: kde-neon-core-signed-amd64.iso
 
 kde-neon-core-signed-amd64.snap-list: kde-neon-core-amd64.json
 	./create-snap-list.sh signed $< $@
diff --git a/debian/neon-core-image-dangerous.yml b/debian/neon-core-image-dangerous.yml
index 5565e6f..f4dab65 100644
--- a/debian/neon-core-image-dangerous.yml
+++ b/debian/neon-core-image-dangerous.yml
@@ -30,7 +30,7 @@ neon_core_image_dangerous:
 
     # Create a folder to publish the files...
     - mkdir -p $CI_PROJECT_DIR/.kde-ci-packages/
-    - mv -vf *.tar.gz $CI_PROJECT_DIR/.kde-ci-packages/
+    - mv -vf *.img.xz *.iso $CI_PROJECT_DIR/.kde-ci-packages/
     # Bring in the Notary Service tooling and ask it to publish for us please
     - git clone https://invent.kde.org/sysadmin/ci-notary-service
     - git clone https://invent.kde.org/sysadmin/ci-utilities
diff --git a/debian/neon-core-image-signed.yml b/debian/neon-core-image-signed.yml
index b2a28f3..b99fcb1 100644
--- a/debian/neon-core-image-signed.yml
+++ b/debian/neon-core-image-signed.yml
@@ -20,7 +20,7 @@ neon_core_image_signed:
 
     # Create a folder to publish the files...
     - mkdir -p $CI_PROJECT_DIR/.kde-ci-packages/
-    - mv -vf *.tar.gz $CI_PROJECT_DIR/.kde-ci-packages/
+    - mv -vf *.img.xz *.iso $CI_PROJECT_DIR/.kde-ci-packages/
     # Bring in the Notary Service tooling and ask it to publish for us please
     - git clone https://invent.kde.org/sysadmin/ci-notary-service
     - git clone https://invent.kde.org/sysadmin/ci-utilities