make: Use cvm.mk to generate release artifacts

duanyangjing · luchsh · commit 7df89c18c51d · 2025-06-03T10:58:09.000+08:00
Also directly test these artifacts in CI
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
@@ -68,6 +68,10 @@ jobs:
       - name: 'Checkout the JDK source'
         uses: actions/checkout@v3
 
+      - name: 'Determine version'
+        id: version
+        run: echo "::set-output name=version::$(cat ./cvm/conf/version)"
+
       - name: 'Get JTReg'
         id: jtreg
         uses: ./.github/actions/get-jtreg
@@ -99,18 +103,34 @@ jobs:
       - name: 'Build'
         run: |
           make -f cvm.mk ${{ inputs.make-target }} MODE=${{ matrix.debug-level}}
+          if [[ '${{ matrix.debug-level }}' == 'release' ]]; then
+            make -f cvm.mk jvm-patch MODE=release SKIP_BUILD=true
+          fi
         shell: bash
 
       - name: 'Pack bundles'
+        if: matrix.debug-level == 'release'
         run: |
-          tar cvzf cvm8+17-${{ inputs.platform }}-${{ matrix.debug-level}}.tar.gz -C output jdk8
+          tar czf CompoundVM_${{ steps.version.outputs.version }}_${{ inputs.platform }}.tar.gz -C output CompoundVM_${{ steps.version.outputs.version }}_${{ inputs.platform }}
+          tar czf CompoundVM_${{ steps.version.outputs.version }}_jvm_patch_${{ inputs.platform }}.tar.gz -C output/CompoundVM_${{ steps.version.outputs.version }}_jvm_patch_${{ inputs.platform }} .
         shell: bash
 
       - name: 'Upload bundles'
         uses: actions/upload-artifact@v4
+        if: matrix.debug-level == 'release'
+        with:
+          name: CompoundVM_${{ steps.version.outputs.version }}_${{ inputs.platform }}.tar.gz
+          path: CompoundVM_${{ steps.version.outputs.version }}_${{ inputs.platform }}.tar.gz
+          retention-days: 1
+          if-no-files-found: error
+          overwrite: true
+
+      - name: 'Upload bundles jvm patch'
+        uses: actions/upload-artifact@v4
+        if: matrix.debug-level == 'release'
         with:
-          name: cvm8+17-${{ inputs.platform }}-${{ matrix.debug-level}}.tar.gz
-          path: cvm8+17-${{ inputs.platform }}-${{ matrix.debug-level}}.tar.gz
+          name: CompoundVM_${{ steps.version.outputs.version }}_jvm_patch_${{ inputs.platform }}.tar.gz
+          path: CompoundVM_${{ steps.version.outputs.version }}_jvm_patch_${{ inputs.platform }}.tar.gz
           retention-days: 1
           if-no-files-found: error
           overwrite: true
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -110,7 +110,7 @@ jobs:
     needs: select
     uses: ./.github/workflows/build-linux.yml
     with:
-      platform: linux-x64
+      platform: linux_x64
       apt-gcc-version: '9'
     # The linux-x64 jdk bundle is used as buildjdk for the cross-compile job
     if: needs.select.outputs.linux-x64 == 'true' || needs.select.outputs.linux-cross-compile == 'true'
@@ -125,8 +125,7 @@ jobs:
       - build-linux-x64
     uses: ./.github/workflows/test-cvm8+17.yml
     with:
-      platform: linux-x64
-      bootjdk-platform: linux-x64
+      platform: linux_x64
       runs-on: ubuntu-22.04
       debug-level: release
 
diff --git a/.github/workflows/test-cvm8+17.yml b/.github/workflows/test-cvm8+17.yml
@@ -25,9 +25,6 @@ on:
       platform:
         required: true
         type: string
-      bootjdk-platform:
-        required: true
-        type: string
       runs-on:
         required: true
         type: string
@@ -66,28 +63,39 @@ jobs:
       - name: 'Checkout the JDK source'
         uses: actions/checkout@v3
 
+      - name: 'Determine version'
+        id: version
+        run: echo "::set-output name=version::$(cat ./cvm/conf/version)"
+
       - name: 'Get bundles'
         uses: actions/download-artifact@v4
         with:
-          name: cvm8+17-${{ inputs.platform }}-${{ inputs.debug-level }}.tar.gz
+          name: CompoundVM_${{ steps.version.outputs.version }}_${{ inputs.platform }}.tar.gz
           path: .
 
       - name: 'Unpack bundles'
         run: |
-          mkdir -p cvm/build
-          tar xzvf cvm8+17-${{ inputs.platform }}-${{ inputs.debug-level }}.tar.gz -C cvm/build
-        shell: bash
-
-      - name: 'Get jdk8u src'
-        id: jdk8u-src
-        run: |
-          wget -nc https://github.com/openjdk/jdk8u/archive/refs/tags/jdk8u382-b03.tar.gz
-          mkdir -p cvm/jdk8u
-          tar -xzf jdk8u382-b03.tar.gz -C cvm/jdk8u --strip-components=1
+          rm -rf cvm/build/jdk8
+          mkdir -p cvm/build/jdk8
+          tar xzvf CompoundVM_${{ steps.version.outputs.version }}_${{ inputs.platform }}.tar.gz -C cvm/build/jdk8 --strip-components=1
         shell: bash
 
       - name: 'Run tests'
         id: run-tests
         run: |
           make -f cvm.mk test_jtreg8_${{ matrix.test-suite }} SKIP_BUILD=true MODE=${{ inputs.debug-level }}
         shell: bash
+
+      - name: 'Get bundles jvm patch'
+        uses: actions/download-artifact@v4
+        with:
+          name: CompoundVM_${{ steps.version.outputs.version }}_jvm_patch_${{ inputs.platform }}.tar.gz
+          path: .
+
+      - name: 'Run sanity test jvm patch'
+        run: |
+          wget -nc https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_linux_hotspot_8u372b07.tar.gz
+          tar xzf OpenJDK8U-jdk_x64_linux_hotspot_8u372b07.tar.gz
+          tar xzf CompoundVM_${{ steps.version.outputs.version }}_jvm_patch_${{ inputs.platform }}.tar.gz -C jdk8u372-b07/
+          jdk8u372-b07/bin/java -version 2>&1 | grep "CompoundVM"
+        shell: bash
diff --git a/cvm.mk b/cvm.mk
@@ -22,7 +22,10 @@ SHELL := /bin/bash
 BOOTJDK17 := $(WORKSPACE)/.bootjdks/jdk-17.0.7+7
 BOOTJDK8 := $(WORKSPACE)/.bootjdks/jdk8u372-b07
 BUILDDIR := $(WORKSPACE)/cvm/build
+VERSION := $(shell cat $(WORKSPACE)/cvm/conf/version)
 OUTPUTDIR := $(WORKSPACE)/output
+DISTRO_NAME := CompoundVM_$(VERSION)_linux_x64
+DISTRO_JVM_PATCH_NAME := CompoundVM_$(VERSION)_jvm_patch_linux_x64
 CVM8DIR := $(BUILDDIR)/jdk8
 CVM8_JARDIR := $(CVM8DIR)/jre/lib
 CVM8_LIBDIR := $(CVM8DIR)/jre/lib/amd64
@@ -94,6 +97,8 @@ endef
 -init-dirs:
 	[[ -d $(BUILDDIR) ]] || mkdir -p $(BUILDDIR)
 	[[ -d $(OUTPUTDIR) ]] || mkdir -p $(OUTPUTDIR)
+	[[ -d $(OUTPUTDIR)/$(DISTRO_NAME) ]] || mkdir -p $(OUTPUTDIR)/$(DISTRO_NAME)
+	[[ -d $(OUTPUTDIR)/$(DISTRO_JVM_PATCH_NAME) ]] || mkdir -p $(OUTPUTDIR)/$(DISTRO_JVM_PATCH_NAME)
 
 # Setup bootstrap JDK from a given URL
 # $1  URL of JDK in tar.gz format
@@ -129,9 +134,18 @@ cvm8default17: jdk8vm17
 	echo "-server17 KNOWN" > $(CVM8_LIBDIR)/jvm.cfg
 	echo "-server KNOWN" >> $(CVM8_LIBDIR)/jvm.cfg
 	echo "-client IGNORE" >> $(CVM8_LIBDIR)/jvm.cfg
-	echo "-server17 KNOWN" > $(OUTPUTDIR)/jdk8/jre/lib/amd64/jvm.cfg
-	echo "-server KNOWN" >> $(OUTPUTDIR)/jdk8/jre/lib/amd64/jvm.cfg
-	echo "-client IGNORE" >> $(OUTPUTDIR)/jdk8/jre/lib/amd64/jvm.cfg
+	echo "-server17 KNOWN" > $(OUTPUTDIR)/$(DISTRO_NAME)/jre/lib/amd64/jvm.cfg
+	echo "-server KNOWN" >> $(OUTPUTDIR)/$(DISTRO_NAME)/jre/lib/amd64/jvm.cfg
+	echo "-client IGNORE" >> $(OUTPUTDIR)/$(DISTRO_NAME)/jre/lib/amd64/jvm.cfg
+
+JVM_PATCH_ARTIFACTS := jre/lib/rt17.jar jre/lib/rt8.jar jre/lib/amd64/libjava17.so jre/lib/amd64/libjimage17.so jre/lib/amd64/libjdwp17.so jre/lib/amd64/server17 jre/lib/amd64/jvm.cfg
+
+jvm-patch: cvm8default17
+	@echo "###### Composing CVM8 jvm patch ######"
+	mkdir -p $(OUTPUTDIR)/$(DISTRO_JVM_PATCH_NAME)
+	for file in $(JVM_PATCH_ARTIFACTS); do \
+		cd $(OUTPUTDIR)/$(DISTRO_NAME) && cp -rf --parents $$file $(OUTPUTDIR)/$(DISTRO_JVM_PATCH_NAME)/; \
+	done
 
 -clean-jdk8vm17:
 	rm -fr $(BUILDDIR)/alt_kernel
@@ -167,13 +181,13 @@ jdk8vm17: -clean-jdk8vm17 -bootstrap build_jdk8u build_jdk17u altkernel
 		cp -f $(SRC_BUILDDIR_17)/jdk/lib/libjdwp.debuginfo $(CVM8_LIBDIR)/libjdwp17.debuginfo && \
 		cp -f $(SRC_BUILDDIR_17)/jdk/lib/server/libjvm.debuginfo $(CVM8_LIBDIR)/server17/libjvm.debuginfo && \
 		[[ "x$$(grep server17 $(CVM8_LIBDIR)/jvm.cfg)" = "x" ]] && echo "-server17 KNOWN" >> $(CVM8_LIBDIR)/jvm.cfg && \
-		cp -rf $(CVM8DIR) $(OUTPUTDIR)/; \
+		cp -rf $(CVM8DIR)/* $(OUTPUTDIR)/$(DISTRO_NAME)/; \
 	}
 ifeq ($(MODE), release)
 	# Remove unwanted files from release build
-	find $(OUTPUTDIR)/jdk8 -name '*.debuginfo' -execdir rm -f {} +
-	find $(OUTPUTDIR)/jdk8 -name '*.diz' -execdir rm -f {} +
-	rm -fr $(OUTPUTDIR)/jdk8/demo
+	find $(OUTPUTDIR)/$(DISTRO_NAME) -name '*.debuginfo' -execdir rm -f {} +
+	find $(OUTPUTDIR)/$(DISTRO_NAME) -name '*.diz' -execdir rm -f {} +
+	rm -fr $(OUTPUTDIR)/$(DISTRO_NAME)/demo
 endif
 	@echo "###### Done ######"
 	@echo
@@ -208,7 +222,7 @@ build_jdk17u: -bootstrap
 											--with-vendor-vm-bug-url="https://github.com/bytedance/CompoundVM/issues" \
 											--without-version-pre \
 											--without-version-opt \
-											--with-cvm-version-string="8.0.0" \
+											--with-cvm-version-string=$(VERSION) \
 											--with-vendor-name="CompoundVM" \
 											; \
 		fi; \
diff --git a/cvm/conf/version b/cvm/conf/version
@@ -0,0 +1 @@
+8.0.1
