Skip to content

Commit 6e8d86b

Browse files
[GR-31538] Fix github action gates.
PullRequest: graal/9151
2 parents 7ec6015 + fc459f5 commit 6e8d86b

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

.github/workflows/main.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ jobs:
9393
PRIMARY: "compiler"
9494
- env:
9595
JDK: "labsjdk-ce-11"
96+
GATE: "build"
97+
PRIMARY: "vm"
98+
DYNAMIC_IMPORTS: "/tools,/substratevm,/sulong"
99+
NATIVE_IMAGES: "polyglot"
96100
WITHOUT_VCS: true
97101
steps:
98102
- uses: actions/checkout@v2
@@ -124,8 +128,9 @@ jobs:
124128
if: ${{ contains(matrix.env.GATE, 'style') }}
125129
run: |
126130
sudo apt install python-pip python-setuptools
127-
sudo pip install astroid==1.1.0
128-
sudo pip install pylint==1.1.0
131+
cat common.json |
132+
jq -r '.deps.common.packages | to_entries[] | select(.key | startswith("pip:")) | (.key | split(":")[1]) + .value' |
133+
xargs sudo pip install
129134
- name: Build GraalVM and run gate
130135
env: ${{ matrix.env }}
131136
run: |
@@ -155,7 +160,6 @@ jobs:
155160
if [[ ${WITHOUT_VCS} ]]
156161
then
157162
rm -rf .git
158-
${MX_PATH}/mx --primary-suite-path substratevm native-image --help
159-
else
160-
${MX_PATH}/mx --primary-suite-path ${PRIMARY} --J @"-Xmx2g" --java-home=${JAVA_HOME} gate --strict-mode --tags ${GATE}
161163
fi
164+
165+
${MX_PATH}/mx --primary-suite-path ${PRIMARY} --J @"-Xmx2g" --java-home=${JAVA_HOME} gate --strict-mode --tags ${GATE}

common.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"MX_PYTHON": "python3"
3333
},
3434
"packages": {
35-
"pip:logilab-common ": "==1.4.4",
35+
"pip:logilab-common": "==1.4.4",
3636
"pip:pylint": "==1.9.3",
3737
"pip:ninja_syntax": "==1.7.2"
3838
}

vm/ci_includes/vm.hocon

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,17 @@ builds += [
9696
]
9797
name: gate-vm-unittest-windows
9898
}
99+
${vm_java_11} ${gate_vm_linux} ${sulong_linux} {
100+
environment: {
101+
DYNAMIC_IMPORTS: "/tools,/substratevm,/sulong"
102+
NATIVE_IMAGES: "polyglot"
103+
}
104+
run: [
105+
[rm, "-rf", "../.git"]
106+
[mx, gate, "--strict-mode", "--tags", "build"]
107+
]
108+
name: gate-vm-build-without-vcs
109+
}
99110
${gate_vm_linux} ${linux-deploy} ${maven_base_8_11} {
100111
run: [
101112
${maven_base_8_11.build}

0 commit comments

Comments
 (0)