Skip to content

Commit 934a3ae

Browse files
committed
move jre in release folder
1 parent c49470e commit 934a3ae

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

.github/workflows/build.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,35 +87,41 @@ jobs:
8787
DEPLOY="./extras/deploy"
8888
RELEASE_DIR="${DEPLOY}/hortonmachine_${VERSION}"
8989
90-
# Query Adoptium (Temurin) API for latest GA JRE 17, Windows x64
90+
# Download fixed Temurin JRE 17 (Windows x64)
9191
JRE_URL="https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jre_x64_windows_hotspot_17.0.16_8.zip"
92-
9392
echo "Downloading Temurin JRE from: ${JRE_URL}"
9493
curl -fsSL -o ./temurin-jre-win.zip "${JRE_URL}"
9594
96-
# Unzip into jre-win inside the release dir
95+
# Unzip and normalize folder name to ./jre
9796
unzip -q ./temurin-jre-win.zip -d .
9897
mv jdk-17.0.16+8-jre jre
9998
rm -f ./temurin-jre-win.zip
10099
101-
# Do NOT delete ${TMPLIBS} here
100+
# Prep release dir (don't delete ${TMPLIBS})
102101
rm -rf "${DEPLOY}/libs" "${RELEASE_DIR}" "${DEPLOY}/hortonmachine_${VERSION}.tar.gz"
103102
mkdir -p "${RELEASE_DIR}"
104103
105104
# Move populated libs into the release dir
106105
mv "${TMPLIBS}" "${RELEASE_DIR}/libs"
107106
108-
# Copy deploy assets
109-
cp -rv ${DEPLOY}/*.sh ${DEPLOY}/*.exe ${DEPLOY}/*.bat ${DEPLOY}/imgs ${DEPLOY}/natives ${DEPLOY}/quiet-logging.properties "${RELEASE_DIR}"
107+
# Copy deploy assets (allow missing patterns without failing)
108+
shopt -s nullglob
109+
cp -rv ${DEPLOY}/*.sh ${DEPLOY}/*.exe ${DEPLOY}/*.bat "${RELEASE_DIR}" || true
110+
cp -rv ${DEPLOY}/imgs ${DEPLOY}/natives ${DEPLOY}/quiet-logging.properties "${RELEASE_DIR}" || true
111+
shopt -u nullglob
112+
113+
# ➜ Put JRE inside the release dir so it's included in the tarball
114+
mv ./jre "${RELEASE_DIR}/jre"
110115
111-
# Tar it up
116+
# Create tarball
112117
tar -C "${DEPLOY}" -zcvf "${DEPLOY}/hortonmachine_${VERSION}.tar.gz" "hortonmachine_${VERSION}"
113118
114-
# (Optional) keep a copy of libs next to the tarball, like your local script
119+
# Optional: keep a copy of libs next to the tarball (and clean temp dir)
115120
mv "${RELEASE_DIR}/libs" "${DEPLOY}/"
116121
rm -rf "${RELEASE_DIR}"
117122
118123
124+
119125
- name: Upload bundle artifact
120126
uses: actions/upload-artifact@v4
121127
with:

0 commit comments

Comments
 (0)