Skip to content

Commit fd2defd

Browse files
committed
Bump version to 1.0.0-rc7 and update image
1 parent b8ae54e commit fd2defd

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

mx.graalsqueak/suite.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@
1313
"name": "graalsqueak",
1414
"versionConflictResolution": "latest",
1515

16-
"version": "1.0.0-rc6",
16+
"version": "1.0.0-rc7",
1717
"graalsqueak:dependencyMap": {
18-
"assets": "1.0.0-rc6",
1918
"graalvm": "19.3.0",
20-
"image": "GraalSqueakImage-1.0.0-rc6.zip",
21-
"jdk8Update": "232",
19+
"image": "GraalSqueakImage-1.0.0-rc7.zip",
20+
"image_tag": "1.0.0-rc7",
21+
"jdk8_update": "232",
2222
"jvmci": "jvmci-19.3-b05",
23-
"testImage": "GraalSqueakTestImage-19329-64bit.zip",
23+
"test_image": "GraalSqueakTestImage-19329-64bit.zip",
24+
"test_image_tag": "1.0.0-rc6",
2425
},
2526

2627
"release": False,

mx.graalsqueak/utils.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ readonly OS_NAME JAVA_HOME_SUFFIX
3333

3434
download-asset() {
3535
local filename=$1
36-
local git_tag="${2:-${DEP_ASSETS}}"
36+
local git_tag=$2
3737
local target="${3:-$1}"
3838

3939
curl -L --retry 3 --retry-connrefused --retry-delay 2 -o "${target}" \
@@ -60,9 +60,9 @@ download-openjdk8-jvmci() {
6060

6161
pushd "${target_dir}" > /dev/null
6262

63-
curl -sSL --retry 3 -o "${jdk_tar}" "https://github.com/graalvm/openjdk8-jvmci-builder/releases/download/${DEP_JVMCI}/openjdk-8u${DEP_JDK8UPDATE}-${DEP_JVMCI}-${OS_NAME}-amd64.tar.gz"
63+
curl -sSL --retry 3 -o "${jdk_tar}" "https://github.com/graalvm/openjdk8-jvmci-builder/releases/download/${DEP_JVMCI}/openjdk-8u${DEP_JDK8_UPDATE}-${DEP_JVMCI}-${OS_NAME}-amd64.tar.gz"
6464
tar xzf "${jdk_tar}"
65-
echo "$(pwd)/openjdk1.8.0_${DEP_JDK8UPDATE}-${DEP_JVMCI}${JAVA_HOME_SUFFIX}"
65+
echo "$(pwd)/openjdk1.8.0_${DEP_JDK8_UPDATE}-${DEP_JVMCI}${JAVA_HOME_SUFFIX}"
6666

6767
popd > /dev/null
6868
}
@@ -72,7 +72,7 @@ download-graalsqueak-image() {
7272

7373
pushd "${target_dir}" > /dev/null
7474

75-
download-asset "${DEP_IMAGE}"
75+
download-asset "${DEP_IMAGE}" "${DEP_IMAGE_TAG}"
7676
unzip "${DEP_IMAGE}"
7777
rm -f "${DEP_IMAGE}"
7878

@@ -89,8 +89,8 @@ ensure-test-image() {
8989
mkdir "${target_dir}" || true
9090
pushd "${target_dir}" > /dev/null
9191

92-
download-asset "${DEP_TESTIMAGE}"
93-
unzip "${DEP_TESTIMAGE}"
92+
download-asset "${DEP_TEST_IMAGE}" "${DEP_TEST_IMAGE_TAG}"
93+
unzip "${DEP_TEST_IMAGE}"
9494
mv ./*.image test-64bit.image
9595
mv ./*.changes test-64bit.changes
9696

src/de.hpi.swa.graal.squeak.shared/src/de/hpi/swa/graal/squeak/shared/SqueakLanguageConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public final class SqueakLanguageConfig {
1111
public static final String MIME_TYPE = "application/x-smalltalk";
1212
public static final String NAME = "Squeak/Smalltalk";
1313
public static final String ST_MIME_TYPE = "text/x-smalltalk";
14-
public static final String VERSION = "1.0.0-rc6";
14+
public static final String VERSION = "1.0.0-rc7";
1515

1616
private SqueakLanguageConfig() {
1717
}

0 commit comments

Comments
 (0)