mirror of
https://github.com/AngelAuraMC/angelauramc-openjdk-build.git
synced 2025-08-03 15:46:08 -04:00
[FEAT] Add TARGET_OS
Used to name the tarballs a bit clearer, mainly for Jenkins.
This commit is contained in:
parent
4ec1bcf523
commit
0b28f59414
6
.github/workflows/build.yml
vendored
6
.github/workflows/build.yml
vendored
@ -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
|
||||
|
@ -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 ..
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user