From 0365bcf590fb115ea23d2e37224b11876b581fa9 Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Wed, 25 Mar 2026 23:53:37 +0000 Subject: [PATCH 1/2] Specify a binding version, and use the checkout script to clone VM repo --- .github/workflows/ci.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 21be1cc..bd64722 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,6 +10,9 @@ on: # This workflow will be triggered in the mmtk-core CI to make sure mmtk-core can build with the docker image. workflow_dispatch: +env: + OPENJDK_BINDING_VERSION: "jdk-21" + jobs: build-mmtk-core: runs-on: ubuntu-latest @@ -28,10 +31,12 @@ jobs: - name: Build OpenJDK run: | docker run mmtk-dev bash -c "\ - git clone https://github.com/mmtk/mmtk-openjdk.git && \ - git clone https://github.com/mmtk/openjdk.git && \ + git clone -b ${{ env.OPENJDK_BINDING_VERSION }} https://github.com/mmtk/mmtk-openjdk.git && \ + cd mmtk-openjdk && \ + .github/scripts/ci-checkout.sh && \ + cd .. && \ export MMTK_OPENJDK_PATH=\$(realpath mmtk-openjdk) && \ - cd openjdk && \ + cd mmtk-openjdk/repos/openjdk && \ export DEBUG_LEVEL=slowdebug && \ sh configure --disable-warnings-as-errors --with-debug-level=\$DEBUG_LEVEL && \ - make CONF=linux-x86_64-normal-server-\$DEBUG_LEVEL THIRD_PARTY_HEAP=\$MMTK_OPENJDK_PATH/openjdk" + make CONF=linux-x86_64-server-\$DEBUG_LEVEL THIRD_PARTY_HEAP=\$MMTK_OPENJDK_PATH/openjdk" From b364ff702febc830551fcd05b6380c51c0e8d17f Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Thu, 26 Mar 2026 00:01:54 +0000 Subject: [PATCH 2/2] Update required boot jdk version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3740af3..c20a794 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ ENV LANG en_US.utf8 RUN apt-get update -y #install the required packages -RUN apt-get install wget curl git python3 openjdk-8-jdk openjdk-11-jdk ant autoconf bison pkg-config zip unzip build-essential gettext gcc-multilib libx11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev libxrandr-dev libcups2-dev libasound2-dev libfontconfig1-dev libtool -y && apt-get clean +RUN apt-get install wget curl git python3 openjdk-21-jdk ant autoconf bison pkg-config zip unzip build-essential gettext gcc-multilib libx11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev libxrandr-dev libcups2-dev libasound2-dev libfontconfig1-dev libtool -y && apt-get clean # get rust toolchain version RUN wget https://raw.githubusercontent.com/mmtk/mmtk-core/master/rust-toolchain