Skip to content

Commit

Permalink
Remove ea and set 0.46 branches to build RC1
Browse files Browse the repository at this point in the history
Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
  • Loading branch information
keithc-ca committed Jul 17, 2024
1 parent ff22f57 commit a75ff73
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 14 deletions.
15 changes: 2 additions & 13 deletions get_source.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,21 +70,10 @@ add_source() {
# Configure the known source repositories.
#
configure_defaults() {
local current_branch="$(git rev-parse --abbrev-ref HEAD)"
local openj9_branch=master
local omr_branch=openj9

# If this repository is on a release branch, use the same branch names
# for OpenJ9 and OMR.
if [[ "$current_branch" =~ (ibm-)?(v[0-9]+\.[0-9]+(\.[0-9]+)?-release) ]] ; then
openj9_branch="${BASH_REMATCH[2]}"
omr_branch="${BASH_REMATCH[2]}"
fi

# folder URL branch options
# ------ --- ------ -------
add_source openj9 https://github.com/eclipse-openj9/openj9.git $openj9_branch
add_source omr https://github.com/eclipse-openj9/openj9-omr.git $omr_branch
add_source openj9 https://github.com/eclipse-openj9/openj9.git v0.46.0-release
add_source omr https://github.com/eclipse-openj9/openj9-omr.git v0.46.0-release

add_source openssl https://github.com/openssl/openssl.git "" "--depth=1"
}
Expand Down
2 changes: 1 addition & 1 deletion jdk/make/closed/autoconf/custom-spec.gmk.in
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ USERNAME := @USERNAME@
include $(SRC_ROOT)/closed/openjdk-tag.gmk

JDK_FIX_VERSION := @JDK_FIX_VERSION@
J9JDK_EXT_VERSION := $(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VERSION).$(JDK_FIX_VERSION)-ea
J9JDK_EXT_VERSION := $(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VERSION).$(JDK_FIX_VERSION)
J9JDK_EXT_NAME := Extensions for OpenJDK for Eclipse OpenJ9

# required by CMake
Expand Down

0 comments on commit a75ff73

Please sign in to comment.