From 5e2b60cfb0d1a070ebd3ffcff6dfa441522ac40e Mon Sep 17 00:00:00 2001
From: "Jason N." <33561705+JasonN3@users.noreply.github.com>
Date: Wed, 14 Feb 2024 22:21:48 +0000
Subject: [PATCH] move workflow_call

---
 .github/workflows/iso.yml | 37 +++++++++++++++++++------------------
 Makefile                  |  2 +-
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/iso.yml b/.github/workflows/iso.yml
index 42d62ec..88fc9ac 100644
--- a/.github/workflows/iso.yml
+++ b/.github/workflows/iso.yml
@@ -1,30 +1,31 @@
 name: Create and publish an ISO
 
 on:
+  workflow_call:
+   inputs:
+     IMAGE_VERSION:
+       required: true
+       type: string
+     IMAGE_ARCH:
+       required: true
+       type: string
+     IMAGE_NAME:
+       required: true
+       type: string
+     IMAGE_REPO:
+       required: true
+       type: string
+     IMAGE_REPO:
+       required: true
+       type: string
+  
   push:
     branches:
       - 'main'
     tags:
       - 'v*'
-  pull_request:
   
-  workflow_call:
-    inputs:
-      IMAGE_VERSION:
-        required: true
-        type: string
-      IMAGE_ARCH:
-        required: true
-        type: string
-      IMAGE_NAME:
-        required: true
-        type: string
-      IMAGE_REPO:
-        required: true
-        type: string
-      IMAGE_REPO:
-        required: true
-        type: string
+  pull_request:
 
 env:
   IMAGE_VERSION: ${{ github.event.inputs.IMAGE_VERSION || '39' }}
diff --git a/Makefile b/Makefile
index 0efcde9..d420941 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ version = 39
 base_dir = $(shell pwd)
 image_repo = ghcr.io/ublue-os
 image_name = base-main
-variant = Server
+variant = Silverblue
 
 image_repo_escaped = $(subst /,\/,$(image_repo))
 image_repo_double_escaped = $(subst \,\\\,$(image_repo_escaped))