mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

JBR-1643 fix intermittent fialures of Windows builds at make/Init.gmk:304

Browse Source 
combine images and test-image into one make invocation
This commit is contained in:
Vitaly Provodin
2020-03-11 16:53:48 +07:00
parent 3dd9bf9212
commit 5baec57d29
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jb/project/tools/windows/scripts/mkbundles.sh
View File

@@ -1,8 +1,8 @@
#!/bin/bash
#!/bin/bash -x
JBSDK_VERSION=$1
JDK_BUILD_NUMBER=$2
build_number=$3
bash -x jb/project/tools/windows/scripts/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jcef" || exit $?
bash -x jb/project/tools/windows/scripts/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx" || exit $?
jb/project/tools/windows/scripts/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jcef" || exit $?
jb/project/tools/windows/scripts/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx" || exit $?

5
jb/project/tools/windows/scripts/mkimages.sh
View File

@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash -x
# The following parameters must be specified:
# JBSDK_VERSION - specifies the current version of OpenJDK e.g. 11_0_6
@@ -71,8 +71,7 @@ PATH="/usr/local/bin:/usr/bin:${PATH}"
--disable-ccache \
--enable-cds=yes || exit 1
make clean CONF=windows-x86_64-normal-server-release || exit 1
make JOBS=7 LOG=info images CONF=windows-x86_64-normal-server-release || exit 1
make JOBS=7 LOG=info test-image || exit 1
make JOBS=7 LOG=info images CONF=windows-x86_64-normal-server-release test-image || exit 1
JSDK=build/windows-x86_64-normal-server-release/images/jdk
JBSDK=${JBRSDK_BASE_NAME}-windows-x64-b${build_number}

2
jb/project/tools/windows/scripts/pack.sh
View File

@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash -x
# The following parameters must be specified:
# JBSDK_VERSION - specifies the current version of OpenJDK e.g. 11_0_6