Skip to content

[GR-68282] Bump ci specVersion to 7 #11832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ local libgraal(builds, include=true) = [b for b in builds if (std.findSubstr("li
assert std.length(std.toString(import 'ci/ci_common/common.jsonnet')) > 0,
ci_resources:: (import 'ci/ci_common/ci-resources.libsonnet'),
overlay: graal_common.ci.overlay,
specVersion: "4",
specVersion: "7",
tierConfig: {
tier1: "gate",
tier2: "gate",
Expand Down
2 changes: 1 addition & 1 deletion ci/ci_common/common.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ common + common.frequencies + {
},
local linux_deps_extras = {
packages+: {
"apache/ant": ">=1.9.4",
"apache/ant": "==1.10.1",
},
},

Expand Down
2 changes: 1 addition & 1 deletion graal-common.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"README": "This file contains definitions that are useful for the jsonnet CI files of the graal and graal-enterprise repositories.",
"ci": {
"overlay": "fdd1c23beaa26526a6d9b6c5dc5ee66feb64672c"
"overlay": "3e032b0adc64c05bbd0aef1c116f4e69796aee9e",
}
}
2 changes: 1 addition & 1 deletion truffle/ci/ci.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
name: 'gate-external-mvn-simplelanguage-' + self.jdk_name,
packages+: {
maven: "==3.3.9",
ruby: ">=2.1.0",
ruby: "==3.0.2",
},
mx_cmd: ["mx"],
run+: [
Expand Down
2 changes: 1 addition & 1 deletion visualizer/ci/ci.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

linux_maven: {
packages+: {
maven: '>=3.3.9',
maven: '==3.9.10',
},
},

Expand Down
2 changes: 1 addition & 1 deletion vm/ci/ci_common/common.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ local devkits = graal_common.devkits;

linux_deploy: self.deploy_build + {
packages+: {
maven: '>=3.3.9',
maven: '==3.5.3',
},
},

Expand Down
2 changes: 1 addition & 1 deletion vm/ci/ci_includes/vm-native.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
components+: ["truffle"],
timelimit: '30:00',
packages+: {
maven: '>=3.3.9',
maven: '==3.5.3',
},
name: self.targets[0] + '-vm-ce-truffle-maven-downloader-labs' + self.jdk_name + '-linux-amd64',
},
Expand Down
2 changes: 1 addition & 1 deletion web-image/ci/ci_common/common.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ local node_map = {

maven: {
packages+: {
maven: '>=3.6.3',
maven: '==3.9.10',
},
},

Expand Down
2 changes: 1 addition & 1 deletion web-image/ci/ci_common/wi-run-spec.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ local os_arch_jdk_mixin(mapping) = r.task_spec(r.evaluate_late({

docker_ol8: {
docker: {
image: 'phx.ocir.io/oraclelabs2/c_graal/buildslave:buildslave_ol8',
image: 'buildslave_ol8',
mount_modules: true,
},
},
Expand Down