reactos/Release_Engineering
1
0
Fork 0
mirror of https://github.com/reactos/Release_Engineering.git synced 2024-11-23 03:49:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add a workaround for git describe not supporting tag+count without hash
Some checks failed
Docker / docker (push) Failing after 20s
Details

Browse Source
This commit is contained in:
Mark Jansen 2024-09-09 14:22:45 +02:00
parent 448fd52557
commit 18bc5b2d3a
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Docker/Dockerfile
View File

@ -32,7 +32,6 @@ RUN wget https://downloads.sourceforge.net/reactos/RosBE-Unix-2.2.1.tar.bz2 \
&& rm -rf RosBE-Unix-2.2.1 && rm -rf RosBE-Unix-2.2.1
RUN git clone https://github.com/reactos/Release_Engineering \ RUN git clone https://github.com/reactos/Release_Engineering \
&& mv Release_Engineering/Release_* /usr/local/bin \ && mv Release_Engineering/Release_* /usr/local/bin \
&& rm -rf Release_Engineering && rm -rf Release_Engineering

7
Release_Configure
View File

@ -46,9 +46,12 @@ else
git checkout "${branch_name}" || exit 1 git checkout "${branch_name}" || exit 1
fi fi
# Get the suffix from Git if none was entered. # Get the version from Git if none was entered.
if [ "${version}" = "" ]; then if [ "${version}" = "" ]; then
version=`git describe --abbrev=0` # Output something like '0.4.15-4-ge1e96bf467b5ea'
version_with_hash=`git describe --always`
# Extract the part before the last dash to ignore the commit hash
version=${version_with_hash%-*}
fi fi
# Write the config file # Write the config file

15
Release_ISOs
View File

@ -13,13 +13,20 @@ if [ "$ROS_ARCH" = "" ]; then
exit 1 exit 1
fi fi
if [ "$ROS_ARCH" = "i386" ]; then
ROS_PRETTY_ARCH="x86"
else
ROS_PRETTY_ARCH="$ROS_ARCH"
fi
# Constants # Constants
ROOTDIR="$PWD" ROOTDIR="$PWD"
OUTPUTDIR="output-MinGW-i386" OUTPUTDIR="output-MinGW-i386"
BOOTCDISO="ReactOS-${version}-${ROS_ARCH}.iso" BOOTCDISO="ReactOS-${version}-${ROS_PRETTY_ARCH}.iso"
BOOTCDZIP="ReactOS-${version}-${ROS_ARCH}-iso.zip" BOOTCDZIP="ReactOS-${version}-${ROS_PRETTY_ARCH}-iso.zip"
LIVECDISO="ReactOS-${version}-${ROS_ARCH}-live.iso" LIVECDISO="ReactOS-${version}-${ROS_PRETTY_ARCH}-live.iso"
LIVECDZIP="ReactOS-${version}-${ROS_ARCH}-live.zip" LIVECDZIP="ReactOS-${version}-${ROS_PRETTY_ARCH}-live.zip"
# Start from a clean state # Start from a clean state
rm -f "${ROOTDIR}/${BOOTCDZIP}" rm -f "${ROOTDIR}/${BOOTCDZIP}"