From 0b28f59414673d410acfa9ee6008d93f1bbc680a Mon Sep 17 00:00:00 2001
From: Eva Isabella Luna <me@crystall1ne.dev>
Date: Sun, 29 Jun 2025 19:36:25 -0600
Subject: [PATCH] [FEAT] Add TARGET_OS

Used to name the tarballs a bit clearer, mainly for Jenkins.
---
 .github/workflows/build.yml | 6 +++---
 8_tarjdk.sh                 | 4 ++--
 setdevkitpath.sh            | 4 ++++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 521ab39..5449594 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,13 +39,13 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: "jdk${{ matrix.version }}-${{matrix.arch}}"
-          path: jdk${{ matrix.version }}*.tar.xz
+          path: jdk${{ matrix.version }}-android*.tar.xz
 
       - name: Upload JRE build output
         uses: actions/upload-artifact@v4
         with:
           name: "jre${{ matrix.version }}-${{matrix.arch}}"
-          path: jre${{ matrix.version }}*.tar.xz
+          path: jre${{ matrix.version }}-android*.tar.xz
 
       - name: Upload JRE debuginfo build output
         uses: actions/upload-artifact@v4
@@ -84,7 +84,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: "jre${{ matrix.version }}-ios-aarch64"
-          path: jre${{ matrix.version }}*.tar.xz
+          path: jre${{ matrix.version }}-ios*.tar.xz
 
       - name: Upload JRE debuginfo build output
         uses: actions/upload-artifact@v4
diff --git a/8_tarjdk.sh b/8_tarjdk.sh
index 9939154..15332ed 100755
--- a/8_tarjdk.sh
+++ b/8_tarjdk.sh
@@ -38,10 +38,10 @@ cd jreout
 find ./ -name '*.so' -execdir ${TOOLCHAIN}/bin/llvm-strip {} \;
 
 
-tar cJf ../jre${TARGET_VERSION}-${TARGET_SHORT}-`date +%Y%m%d`-${JDK_DEBUG_LEVEL}.tar.xz .
+tar cJf ../jre${TARGET_VERSION}-${TARGET_OS}-${TARGET_SHORT}-`date +%Y%m%d`-${JDK_DEBUG_LEVEL}.tar.xz .
 
 cd ../jdkout
-tar cJf ../jdk${TARGET_VERSION}-${TARGET_SHORT}-`date +%Y%m%d`-${JDK_DEBUG_LEVEL}.tar.xz .
+tar cJf ../jdk${TARGET_VERSION}-${TARGET_OS}-${TARGET_SHORT}-`date +%Y%m%d`-${JDK_DEBUG_LEVEL}.tar.xz .
 
 # Remove jreout and jdkout
 cd ..
diff --git a/setdevkitpath.sh b/setdevkitpath.sh
index 81ac2d9..d33e505 100755
--- a/setdevkitpath.sh
+++ b/setdevkitpath.sh
@@ -54,6 +54,8 @@ if [[ "$BUILD_IOS" == "1" ]]; then
   export HOTSPOT_DISABLE_DTRACE_PROBES=1
 
   export ANDROID_INCLUDE=$PWD/ios-missing-include
+
+  export TARGET_OS=ios
 else
 
 export JVM_PLATFORM=linux
@@ -88,4 +90,6 @@ export LD=$TOOLCHAIN/bin/ld
 export OBJCOPY=$TOOLCHAIN/bin/llvm-objcopy
 export RANLIB=$TOOLCHAIN/bin/llvm-ranlib
 export STRIP=$TOOLCHAIN/bin/llvm-strip
+
+export TARGET_OS=android
 fi