diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ab414c1ac7b5..f250aaa3f3cf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -93,6 +93,10 @@ jobs: PRIMARY: "compiler" - env: JDK: "labsjdk-ce-11" + GATE: "build" + PRIMARY: "vm" + DYNAMIC_IMPORTS: "/tools,/substratevm,/sulong" + NATIVE_IMAGES: "polyglot" WITHOUT_VCS: true steps: - uses: actions/checkout@v2 @@ -124,8 +128,9 @@ jobs: if: ${{ contains(matrix.env.GATE, 'style') }} run: | sudo apt install python-pip python-setuptools - sudo pip install astroid==1.1.0 - sudo pip install pylint==1.1.0 + cat common.json | + jq -r '.deps.common.packages | to_entries[] | select(.key | startswith("pip:")) | (.key | split(":")[1]) + .value' | + xargs sudo pip install - name: Build GraalVM and run gate env: ${{ matrix.env }} run: | @@ -155,7 +160,6 @@ jobs: if [[ ${WITHOUT_VCS} ]] then rm -rf .git - ${MX_PATH}/mx --primary-suite-path substratevm native-image --help - else - ${MX_PATH}/mx --primary-suite-path ${PRIMARY} --J @"-Xmx2g" --java-home=${JAVA_HOME} gate --strict-mode --tags ${GATE} fi + + ${MX_PATH}/mx --primary-suite-path ${PRIMARY} --J @"-Xmx2g" --java-home=${JAVA_HOME} gate --strict-mode --tags ${GATE} diff --git a/common.json b/common.json index 30269f61440c..338b1f32a566 100644 --- a/common.json +++ b/common.json @@ -32,7 +32,7 @@ "MX_PYTHON": "python3" }, "packages": { - "pip:logilab-common ": "==1.4.4", + "pip:logilab-common": "==1.4.4", "pip:pylint": "==1.9.3", "pip:ninja_syntax": "==1.7.2" } diff --git a/vm/ci_includes/vm.hocon b/vm/ci_includes/vm.hocon index 9ffff014aa4b..e434bd4b0749 100644 --- a/vm/ci_includes/vm.hocon +++ b/vm/ci_includes/vm.hocon @@ -96,6 +96,17 @@ builds += [ ] name: gate-vm-unittest-windows } + ${vm_java_11} ${gate_vm_linux} ${sulong_linux} { + environment: { + DYNAMIC_IMPORTS: "/tools,/substratevm,/sulong" + NATIVE_IMAGES: "polyglot" + } + run: [ + [rm, "-rf", "../.git"] + [mx, gate, "--strict-mode", "--tags", "build"] + ] + name: gate-vm-build-without-vcs + } ${gate_vm_linux} ${linux-deploy} ${maven_base_8_11} { run: [ ${maven_base_8_11.build}