Skip to content

Commit 77dd4a0

Browse files
pejovicazapster
authored andcommitted
[GR-67552] Update NINJA version on Windows
PullRequest: mx/1916
2 parents 4676e40 + 26451f7 commit 77dd4a0

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

mx.mx/suite.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -835,16 +835,17 @@
835835

836836
"NINJA" : {
837837
"packedResource" : True,
838-
"version" : "1.10.2",
839838
"os_arch" : {
840839
"linux" : {
841840
"amd64" : {
841+
"version" : "1.10.2",
842842
# Built from the same source as https://github.com/ninja-build/ninja/releases/download/v{version}/ninja-linux.zip,
843843
# but on a system with older glibc for maximum compatibility with older Linux distributions.
844844
"urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/ninja-{version}-linux-amd64.zip"],
845845
"digest": "sha512:203be0ba85c899530cbf8d27f9f2a2e8247ae3cea66ea3f9f2e2f159cc4583bf424c130791f9ac6d70a4abf53e48291a696704b0670272ceb5ab63d00003acaf"
846846
},
847847
"aarch64" : {
848+
"version" : "1.10.2",
848849
"urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/ninja-{version}-linux-aarch64.zip"],
849850
"digest": "sha512:6592d1c6397a3968df5d473c11c29de040df938a06ac5351f09bdea10fe78a4d171e9dd8be68e62cba30d01b72d575f55b29376b46812e7c4c168df34dbbf76f"
850851
},
@@ -861,24 +862,30 @@
861862
# git checkout <github release commit of the particular Ninja version>
862863
# ./configure.py --bootstrap
863864
"amd64" : {
865+
"version" : "1.10.2",
864866
"urls" : ["https://lafo.ssw.jku.at/pub/graal-external-deps/ninja-{version}-linux-amd64-musl.zip"],
865867
"digest": "sha512:5f23099cac6d9e852c2368930ecf0eb859afc17aeba48cbcba844ecb7a020e30aae2f637186544d780a1319162a4b4dc8b230996f19ce0b4f1aeb61be6a56653"
866868
}
867869
},
868870
"darwin" : {
869871
"amd64" : {
872+
"version" : "1.10.2",
870873
"urls" : ["https://github.com/ninja-build/ninja/releases/download/v{version}/ninja-mac.zip"],
871874
"digest": "sha512:bcd12f6a3337591306d1b99a7a25a6933779ba68db79f17c1d3087d7b6308d245daac08df99087ff6be8dc7dd0dcdbb3a50839a144745fa719502b3a7a07260b"
872875
},
873876
"aarch64" : {
877+
"version" : "1.10.2",
874878
"urls" : ["https://github.com/ninja-build/ninja/releases/download/v{version}/ninja-mac.zip"],
875879
"digest": "sha512:bcd12f6a3337591306d1b99a7a25a6933779ba68db79f17c1d3087d7b6308d245daac08df99087ff6be8dc7dd0dcdbb3a50839a144745fa719502b3a7a07260b"
876880
}
877881
},
878882
"windows" : {
879883
"amd64" : {
884+
# This is a hotfix version for Windows to support long paths (GR-67552). Eventually, this dependency should
885+
# be updated and built from source on all platforms (GR-13214).
886+
"version" : "1.12.1",
880887
"urls" : ["https://github.com/ninja-build/ninja/releases/download/v{version}/ninja-win.zip"],
881-
"digest": "sha512:6004140d92e86afbb17b49c49037ccd0786ce238f340f7d0e62b4b0c29ed0d6ad0bab11feda2094ae849c387d70d63504393714ed0a1f4d3a1f155af7a4f1ba3"
888+
"digest": "sha512:d6715c6458d798bcb809f410c0364dabd937b5b7a3ddb4cd5aba42f9fca45139b2a8a3e7fd9fbd88fd75d298ed99123220b33c7bdc8966a9d5f2a1c9c230955f"
882889
}
883890
},
884891
"solaris" : {

src/mx/mx_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# The version must be updated for every PR (checked in CI) and the comment should reflect the PR's issue
2-
version = "7.58.8" # GR-67459: Fix how hooks are registered in CustomHarnessBenchmarkSuite
2+
version = "7.58.9" # [GR-67552] Update NINJA version on Windows

0 commit comments

Comments
 (0)