From 98fe4e894bd32c8692702645f9c30668e556b92f Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Tue, 13 Feb 2024 18:17:34 +0000
Subject: [PATCH] merged the export build jobs into a single build job

---
 .forgejo/workflows/actions.yaml | 38 +++++++++++++--------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/.forgejo/workflows/actions.yaml b/.forgejo/workflows/actions.yaml
index 0425514..b0f8e4a 100644
--- a/.forgejo/workflows/actions.yaml
+++ b/.forgejo/workflows/actions.yaml
@@ -45,7 +45,7 @@ jobs:
         env:
           GITEA_TOKEN: ${{ secrets.COASTALCOMMITSTOKEN }}
 
-  Build Prism Launcher Export File:
+  Build Export Files:
     runs-on: docker
     container: catthehacker/ubuntu:act-latest
     steps:
@@ -54,30 +54,22 @@ jobs:
 
       - name: Copy export files
         run: |
-          mkdir -vp /export/.minecraft
-          cp -vrT ./build/prism /export
-          cp -v ./unsup.ini /export/.minecraft/
+          cp -vrT ./build/atlauncher ~/export/atlauncher
+          cp -vp ./unsup.ini ~/export/atlauncher/.minecraft/
 
-      - name: Upload export artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: PrismLauncher
-          path: /export/
+          mkdir -vp ~/export/prism/.minecraft
+          cp -vrT ./build/prism ~/export/prism
+          cp -v ./unsup.ini ~/export/prism/.minecraft/
 
-  Build ATLauncher Export File:
-    runs-on: docker
-    container: catthehacker/ubuntu:act-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Copy export files
-        run: |
-          cp -vrT ./build/atlauncher /export
-          cp -vp ./unsup.ini /export/.minecraft/
-
-      - name: Upload export artifact
+      - name: Upload ATLauncher export artifact
         uses: actions/upload-artifact@v3
         with:
           name: ATLauncher
-          path: /export/
+          path: /export/atlauncher/
+        continue-on-error: true
+
+      - name: Upload Prism Launcher export artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: PrismLauncher
+          path: /export/prism/