Skip to content

Commit 99ec2a7

Browse files
helly25helly25
committed
Limit test to 20.1.3 to prevent unnecessary diffs.
1 parent 0857c2c commit 99ec2a7

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

‎toolchain/internal/llvm_distributions.bzl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1420,7 +1420,12 @@ def _requirements_test_writer_impl(ctx):
14201420
The test generated file '<rule_name>.out' contains the following lines:
14211421
[<arch>,<os>,<requirement>]: <llvm_distribution_basename>
14221422
"""
1423-
all_llvm_distributions = _llvm_distributions
1423+
all_llvm_distributions = {
1424+
# In order to prevent new distributions to interfere we cut at 20.1.3.
1425+
k: v
1426+
for k, v in _llvm_distributions.items()
1427+
if _parse_version(_get_version_from_distribution(k)) <= (20, 1, 3)
1428+
}
14241429
requirement_list = [
14251430
"latest:<=20.1.0",
14261431
"latest:<=20.1.0,>17.0.4,!=19.1.7",

‎toolchain/internal/llvm_requirements_test.golden.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,39 @@
44
[aarch64,darwin,'latest:<20.1.0,>17.0.4']: 19.1.7 = LLVM-19.1.7-macOS-ARM64.tar.xz
55
[aarch64,darwin,'latest:>=15.0.6,<16']: 15.0.7 = clang+llvm-15.0.7-arm64-apple-darwin22.0.tar.xz
66
[aarch64,darwin,'first:>=15.0.6,<16']: 15.0.6 = clang+llvm-15.0.6-arm64-apple-darwin21.0.tar.xz
7-
[aarch64,darwin,'latest']: 20.1.4 = LLVM-20.1.4-macOS-ARM64.tar.xz
7+
[aarch64,darwin,'latest']: 20.1.3 = LLVM-20.1.3-macOS-ARM64.tar.xz
88
[aarch64,darwin,'first']: 14.0.6 = clang+llvm-14.0.6-arm64-apple-darwin22.3.0.tar.xz
99
[aarch64,linux,ubuntu,0,'latest:<=20.1.0']: 20.1.0 = LLVM-20.1.0-Linux-ARM64.tar.xz
1010
[aarch64,linux,ubuntu,0,'latest:<=20.1.0,>17.0.4,!=19.1.7']: 20.1.0 = LLVM-20.1.0-Linux-ARM64.tar.xz
1111
[aarch64,linux,ubuntu,0,'latest:<20.1.0,>17.0.4,!=19.1.7']: 19.1.6 = clang+llvm-19.1.6-aarch64-linux-gnu.tar.xz
1212
[aarch64,linux,ubuntu,0,'latest:<20.1.0,>17.0.4']: 19.1.7 = clang+llvm-19.1.7-aarch64-linux-gnu.tar.xz
1313
[aarch64,linux,ubuntu,0,'latest:>=15.0.6,<16']: 15.0.6 = clang+llvm-15.0.6-aarch64-linux-gnu.tar.xz
1414
[aarch64,linux,ubuntu,0,'first:>=15.0.6,<16']: 15.0.6 = clang+llvm-15.0.6-aarch64-linux-gnu.tar.xz
15-
[aarch64,linux,ubuntu,0,'latest']: 20.1.5 = LLVM-20.1.5-Linux-ARM64.tar.xz
15+
[aarch64,linux,ubuntu,0,'latest']: 20.1.3 = LLVM-20.1.3-Linux-ARM64.tar.xz
1616
[aarch64,linux,ubuntu,0,'first']: 6.0.0 = clang+llvm-6.0.0-aarch64-linux-gnu.tar.xz
1717
[aarch64,linux,raspbian,0,'latest:<=20.1.0']: 20.1.0 = LLVM-20.1.0-Linux-ARM64.tar.xz
1818
[aarch64,linux,raspbian,0,'latest:<=20.1.0,>17.0.4,!=19.1.7']: 20.1.0 = LLVM-20.1.0-Linux-ARM64.tar.xz
1919
[aarch64,linux,raspbian,0,'latest:<20.1.0,>17.0.4,!=19.1.7']: 19.1.6 = clang+llvm-19.1.6-aarch64-linux-gnu.tar.xz
2020
[aarch64,linux,raspbian,0,'latest:<20.1.0,>17.0.4']: 19.1.7 = clang+llvm-19.1.7-aarch64-linux-gnu.tar.xz
2121
[aarch64,linux,raspbian,0,'latest:>=15.0.6,<16']: 15.0.6 = clang+llvm-15.0.6-aarch64-linux-gnu.tar.xz
2222
[aarch64,linux,raspbian,0,'first:>=15.0.6,<16']: 15.0.6 = clang+llvm-15.0.6-aarch64-linux-gnu.tar.xz
23-
[aarch64,linux,raspbian,0,'latest']: 20.1.5 = LLVM-20.1.5-Linux-ARM64.tar.xz
23+
[aarch64,linux,raspbian,0,'latest']: 20.1.3 = LLVM-20.1.3-Linux-ARM64.tar.xz
2424
[aarch64,linux,raspbian,0,'first']: 6.0.0 = clang+llvm-6.0.0-aarch64-linux-gnu.tar.xz
2525
[aarch64,linux,rhel,0,'latest:<=20.1.0']: 20.1.0 = LLVM-20.1.0-Linux-ARM64.tar.xz
2626
[aarch64,linux,rhel,0,'latest:<=20.1.0,>17.0.4,!=19.1.7']: 20.1.0 = LLVM-20.1.0-Linux-ARM64.tar.xz
2727
[aarch64,linux,rhel,0,'latest:<20.1.0,>17.0.4,!=19.1.7']: 19.1.6 = clang+llvm-19.1.6-aarch64-linux-gnu.tar.xz
2828
[aarch64,linux,rhel,0,'latest:<20.1.0,>17.0.4']: 19.1.7 = clang+llvm-19.1.7-aarch64-linux-gnu.tar.xz
2929
[aarch64,linux,rhel,0,'latest:>=15.0.6,<16']: 15.0.6 = clang+llvm-15.0.6-aarch64-linux-gnu.tar.xz
3030
[aarch64,linux,rhel,0,'first:>=15.0.6,<16']: 15.0.6 = clang+llvm-15.0.6-aarch64-linux-gnu.tar.xz
31-
[aarch64,linux,rhel,0,'latest']: 20.1.5 = LLVM-20.1.5-Linux-ARM64.tar.xz
31+
[aarch64,linux,rhel,0,'latest']: 20.1.3 = LLVM-20.1.3-Linux-ARM64.tar.xz
3232
[aarch64,linux,rhel,0,'first']: 6.0.0 = clang+llvm-6.0.0-aarch64-linux-gnu.tar.xz
3333
[aarch64,windows,'latest:<=20.1.0']: 20.1.0 = clang+llvm-20.1.0-aarch64-pc-windows-msvc.tar.xz
3434
[aarch64,windows,'latest:<=20.1.0,>17.0.4,!=19.1.7']: 20.1.0 = clang+llvm-20.1.0-aarch64-pc-windows-msvc.tar.xz
3535
[aarch64,windows,"latest:<20.1.0,>17.0.4,!=19.1.7"]: ERROR: No matching distribution found.
3636
[aarch64,windows,"latest:<20.1.0,>17.0.4"]: ERROR: No matching distribution found.
3737
[aarch64,windows,"latest:>=15.0.6,<16"]: ERROR: No matching distribution found.
3838
[aarch64,windows,"first:>=15.0.6,<16"]: ERROR: No matching distribution found.
39-
[aarch64,windows,'latest']: 20.1.5 = clang+llvm-20.1.5-aarch64-pc-windows-msvc.tar.xz
39+
[aarch64,windows,'latest']: 20.1.3 = clang+llvm-20.1.3-aarch64-pc-windows-msvc.tar.xz
4040
[aarch64,windows,'first']: 20.1.0 = clang+llvm-20.1.0-aarch64-pc-windows-msvc.tar.xz
4141
[armv7a,darwin,"latest:<=20.1.0"]: ERROR: No matching distribution found.
4242
[armv7a,darwin,"latest:<=20.1.0,>17.0.4,!=19.1.7"]: ERROR: No matching distribution found.
@@ -52,23 +52,23 @@
5252
[armv7a,linux,ubuntu,0,'latest:<20.1.0,>17.0.4']: 19.1.7 = clang+llvm-19.1.7-armv7a-linux-gnueabihf.tar.gz
5353
[armv7a,linux,ubuntu,0,'latest:>=15.0.6,<16']: 15.0.6 = clang+llvm-15.0.6-armv7a-linux-gnueabihf.tar.xz
5454
[armv7a,linux,ubuntu,0,'first:>=15.0.6,<16']: 15.0.6 = clang+llvm-15.0.6-armv7a-linux-gnueabihf.tar.xz
55-
[armv7a,linux,ubuntu,0,'latest']: 20.1.5 = clang+llvm-20.1.5-armv7a-linux-gnueabihf.tar.gz
55+
[armv7a,linux,ubuntu,0,'latest']: 20.1.3 = clang+llvm-20.1.3-armv7a-linux-gnueabihf.tar.gz
5656
[armv7a,linux,ubuntu,0,'first']: 6.0.0 = clang+llvm-6.0.0-armv7a-linux-gnueabihf.tar.xz
5757
[armv7a,linux,raspbian,0,'latest:<=20.1.0']: 20.1.0 = clang+llvm-20.1.0-armv7a-linux-gnueabihf.tar.gz
5858
[armv7a,linux,raspbian,0,'latest:<=20.1.0,>17.0.4,!=19.1.7']: 20.1.0 = clang+llvm-20.1.0-armv7a-linux-gnueabihf.tar.gz
5959
[armv7a,linux,raspbian,0,'latest:<20.1.0,>17.0.4,!=19.1.7']: 19.1.6 = clang+llvm-19.1.6-armv7a-linux-gnueabihf.tar.gz
6060
[armv7a,linux,raspbian,0,'latest:<20.1.0,>17.0.4']: 19.1.7 = clang+llvm-19.1.7-armv7a-linux-gnueabihf.tar.gz
6161
[armv7a,linux,raspbian,0,'latest:>=15.0.6,<16']: 15.0.6 = clang+llvm-15.0.6-armv7a-linux-gnueabihf.tar.xz
6262
[armv7a,linux,raspbian,0,'first:>=15.0.6,<16']: 15.0.6 = clang+llvm-15.0.6-armv7a-linux-gnueabihf.tar.xz
63-
[armv7a,linux,raspbian,0,'latest']: 20.1.5 = clang+llvm-20.1.5-armv7a-linux-gnueabihf.tar.gz
63+
[armv7a,linux,raspbian,0,'latest']: 20.1.3 = clang+llvm-20.1.3-armv7a-linux-gnueabihf.tar.gz
6464
[armv7a,linux,raspbian,0,'first']: 6.0.0 = clang+llvm-6.0.0-armv7a-linux-gnueabihf.tar.xz
6565
[armv7a,linux,rhel,0,'latest:<=20.1.0']: 20.1.0 = clang+llvm-20.1.0-armv7a-linux-gnueabihf.tar.gz
6666
[armv7a,linux,rhel,0,'latest:<=20.1.0,>17.0.4,!=19.1.7']: 20.1.0 = clang+llvm-20.1.0-armv7a-linux-gnueabihf.tar.gz
6767
[armv7a,linux,rhel,0,'latest:<20.1.0,>17.0.4,!=19.1.7']: 19.1.6 = clang+llvm-19.1.6-armv7a-linux-gnueabihf.tar.gz
6868
[armv7a,linux,rhel,0,'latest:<20.1.0,>17.0.4']: 19.1.7 = clang+llvm-19.1.7-armv7a-linux-gnueabihf.tar.gz
6969
[armv7a,linux,rhel,0,'latest:>=15.0.6,<16']: 15.0.6 = clang+llvm-15.0.6-armv7a-linux-gnueabihf.tar.xz
7070
[armv7a,linux,rhel,0,'first:>=15.0.6,<16']: 15.0.6 = clang+llvm-15.0.6-armv7a-linux-gnueabihf.tar.xz
71-
[armv7a,linux,rhel,0,'latest']: 20.1.5 = clang+llvm-20.1.5-armv7a-linux-gnueabihf.tar.gz
71+
[armv7a,linux,rhel,0,'latest']: 20.1.3 = clang+llvm-20.1.3-armv7a-linux-gnueabihf.tar.gz
7272
[armv7a,linux,rhel,0,'first']: 6.0.0 = clang+llvm-6.0.0-armv7a-linux-gnueabihf.tar.xz
7373
[armv7a,windows,"latest:<=20.1.0"]: ERROR: No matching distribution found.
7474
[armv7a,windows,"latest:<=20.1.0,>17.0.4,!=19.1.7"]: ERROR: No matching distribution found.
@@ -92,29 +92,29 @@
9292
[x86_64,linux,ubuntu,0,'latest:<20.1.0,>17.0.4']: 19.1.7 = LLVM-19.1.7-Linux-X64.tar.xz
9393
[x86_64,linux,ubuntu,0,'latest:>=15.0.6,<16']: 15.0.6 = clang+llvm-15.0.6-x86_64-linux-gnu-ubuntu-18.04.tar.xz
9494
[x86_64,linux,ubuntu,0,'first:>=15.0.6,<16']: 15.0.6 = clang+llvm-15.0.6-x86_64-linux-gnu-ubuntu-18.04.tar.xz
95-
[x86_64,linux,ubuntu,0,'latest']: 20.1.5 = LLVM-20.1.5-Linux-X64.tar.xz
95+
[x86_64,linux,ubuntu,0,'latest']: 20.1.3 = LLVM-20.1.3-Linux-X64.tar.xz
9696
[x86_64,linux,ubuntu,0,'first']: 6.0.0 = clang+llvm-6.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz
9797
[x86_64,linux,raspbian,0,'latest:<=20.1.0']: 20.1.0 = LLVM-20.1.0-Linux-X64.tar.xz
9898
[x86_64,linux,raspbian,0,'latest:<=20.1.0,>17.0.4,!=19.1.7']: 20.1.0 = LLVM-20.1.0-Linux-X64.tar.xz
9999
[x86_64,linux,raspbian,0,'latest:<20.1.0,>17.0.4,!=19.1.7']: 19.1.6 = LLVM-19.1.6-Linux-X64.tar.xz
100100
[x86_64,linux,raspbian,0,'latest:<20.1.0,>17.0.4']: 19.1.7 = LLVM-19.1.7-Linux-X64.tar.xz
101101
[x86_64,linux,"latest:>=15.0.6,<16"]: ERROR: No matching distribution found.
102102
[x86_64,linux,"first:>=15.0.6,<16"]: ERROR: No matching distribution found.
103-
[x86_64,linux,raspbian,0,'latest']: 20.1.5 = LLVM-20.1.5-Linux-X64.tar.xz
103+
[x86_64,linux,raspbian,0,'latest']: 20.1.3 = LLVM-20.1.3-Linux-X64.tar.xz
104104
[x86_64,linux,raspbian,0,'first']: 19.1.0 = LLVM-19.1.0-Linux-X64.tar.xz
105105
[x86_64,linux,rhel,0,'latest:<=20.1.0']: 20.1.0 = LLVM-20.1.0-Linux-X64.tar.xz
106106
[x86_64,linux,rhel,0,'latest:<=20.1.0,>17.0.4,!=19.1.7']: 20.1.0 = LLVM-20.1.0-Linux-X64.tar.xz
107107
[x86_64,linux,rhel,0,'latest:<20.1.0,>17.0.4,!=19.1.7']: 19.1.6 = LLVM-19.1.6-Linux-X64.tar.xz
108108
[x86_64,linux,rhel,0,'latest:<20.1.0,>17.0.4']: 19.1.7 = LLVM-19.1.7-Linux-X64.tar.xz
109109
[x86_64,linux,rhel,0,'latest:>=15.0.6,<16']: 15.0.6 = clang+llvm-15.0.6-x86_64-linux-gnu-ubuntu-18.04.tar.xz
110110
[x86_64,linux,rhel,0,'first:>=15.0.6,<16']: 15.0.6 = clang+llvm-15.0.6-x86_64-linux-gnu-ubuntu-18.04.tar.xz
111-
[x86_64,linux,rhel,0,'latest']: 20.1.5 = LLVM-20.1.5-Linux-X64.tar.xz
111+
[x86_64,linux,rhel,0,'latest']: 20.1.3 = LLVM-20.1.3-Linux-X64.tar.xz
112112
[x86_64,linux,rhel,0,'first']: 6.0.0 = clang+llvm-6.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz
113113
[x86_64,windows,'latest:<=20.1.0']: 20.1.0 = clang+llvm-20.1.0-x86_64-pc-windows-msvc.tar.xz
114114
[x86_64,windows,'latest:<=20.1.0,>17.0.4,!=19.1.7']: 20.1.0 = clang+llvm-20.1.0-x86_64-pc-windows-msvc.tar.xz
115115
[x86_64,windows,'latest:<20.1.0,>17.0.4,!=19.1.7']: 19.1.6 = clang+llvm-19.1.6-x86_64-pc-windows-msvc.tar.xz
116116
[x86_64,windows,'latest:<20.1.0,>17.0.4']: 19.1.7 = clang+llvm-19.1.7-x86_64-pc-windows-msvc.tar.xz
117117
[x86_64,windows,"latest:>=15.0.6,<16"]: ERROR: No matching distribution found.
118118
[x86_64,windows,"first:>=15.0.6,<16"]: ERROR: No matching distribution found.
119-
[x86_64,windows,'latest']: 20.1.5 = clang+llvm-20.1.5-x86_64-pc-windows-msvc.tar.xz
119+
[x86_64,windows,'latest']: 20.1.3 = clang+llvm-20.1.3-x86_64-pc-windows-msvc.tar.xz
120120
[x86_64,windows,'first']: 18.1.0 = clang+llvm-18.1.0-x86_64-pc-windows-msvc.tar.xz

0 commit comments

Comments
 (0)