From fd273e03299d16af2b12b76626e2377f839743a8 Mon Sep 17 00:00:00 2001
From: Noel Miller <noelmiller@protonmail.com>
Date: Tue, 5 Mar 2024 23:21:02 -0600
Subject: [PATCH] fix: simplified build process

---
 .github/workflows/build-and-test.yml | 2 +-
 Containerfile                        | 2 +-
 entrypoint.sh                        | 7 -------
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 6f6ec9c..23df421 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -17,7 +17,7 @@ env:
   VARIANT: 'Server'
   SECURE_BOOT_KEY_URL: 'https://github.com/ublue-os/akmods/raw/main/certs/public_key.der'
   ENROLLMENT_PASSWORD: 'container-installer'
-  OUTPUT_DIR: '/github/workspace/build'
+  OUTPUT_DIR: '/build-container-installer/build'
 
 
 jobs:
diff --git a/Containerfile b/Containerfile
index 8f62034..6cce8cd 100644
--- a/Containerfile
+++ b/Containerfile
@@ -9,7 +9,7 @@ ENV IMAGE_TAG="${VERSION}"
 ENV VARIANT="Server"
 ENV VERSION="${VERSION}"
 ENV WEB_UI="false"
-ENV OUTPUT_DIR="/github/workspace/build"
+ENV OUTPUT_DIR="/build-container-installer/build"
 
 RUN mkdir /build-container-installer
 
diff --git a/entrypoint.sh b/entrypoint.sh
index c590444..d8602a8 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -14,10 +14,3 @@ make boot.iso $@
 
 # Add container to ISO
 make build/deploy.iso $@
-
-# Make output dir in github workspace
-mkdir ${OUTPUT_DIR} || true
-
-# Copy resulting iso to github workspace and fix permissions
-cp /build-container-installer/build/deploy.iso ${OUTPUT_DIR}
-chmod -R ugo=rwX ${OUTPUT_DIR}