Skip to content

Commit df9dce6

Browse files
charliermarshindygreg
charliermarsh
authored and
indygreg
committed
Remove LTO-only builds when PGO+LTO exists
1 parent 7dbef16 commit df9dce6

File tree

3 files changed

+2
-94
lines changed

3 files changed

+2
-94
lines changed

‎.github/workflows/apple.yml

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ jobs:
4747
runner: macos-14
4848
py: 'cpython-3.8'
4949
optimizations: 'debug'
50-
- target_triple: 'aarch64-apple-darwin'
51-
runner: macos-14
52-
py: 'cpython-3.8'
53-
optimizations: 'lto'
5450
- target_triple: 'aarch64-apple-darwin'
5551
runner: macos-14
5652
py: 'cpython-3.8'
@@ -64,10 +60,6 @@ jobs:
6460
runner: macos-14
6561
py: 'cpython-3.9'
6662
optimizations: 'debug'
67-
- target_triple: 'aarch64-apple-darwin'
68-
runner: macos-14
69-
py: 'cpython-3.9'
70-
optimizations: 'lto'
7163
- target_triple: 'aarch64-apple-darwin'
7264
runner: macos-14
7365
py: 'cpython-3.9'
@@ -81,10 +73,6 @@ jobs:
8173
runner: macos-14
8274
py: 'cpython-3.10'
8375
optimizations: 'debug'
84-
- target_triple: 'aarch64-apple-darwin'
85-
runner: macos-14
86-
py: 'cpython-3.10'
87-
optimizations: 'lto'
8876
- target_triple: 'aarch64-apple-darwin'
8977
runner: macos-14
9078
py: 'cpython-3.10'
@@ -98,10 +86,6 @@ jobs:
9886
runner: macos-14
9987
py: 'cpython-3.11'
10088
optimizations: 'debug'
101-
- target_triple: 'aarch64-apple-darwin'
102-
runner: macos-14
103-
py: 'cpython-3.11'
104-
optimizations: 'lto'
10589
- target_triple: 'aarch64-apple-darwin'
10690
runner: macos-14
10791
py: 'cpython-3.11'
@@ -115,10 +99,6 @@ jobs:
11599
runner: macos-14
116100
py: 'cpython-3.12'
117101
optimizations: 'debug'
118-
- target_triple: 'aarch64-apple-darwin'
119-
runner: macos-14
120-
py: 'cpython-3.12'
121-
optimizations: 'lto'
122102
- target_triple: 'aarch64-apple-darwin'
123103
runner: macos-14
124104
py: 'cpython-3.12'
@@ -135,10 +115,6 @@ jobs:
135115
runner: macos-13
136116
py: 'cpython-3.8'
137117
optimizations: 'debug'
138-
- target_triple: 'x86_64-apple-darwin'
139-
runner: macos-13
140-
py: 'cpython-3.8'
141-
optimizations: 'lto'
142118
- target_triple: 'x86_64-apple-darwin'
143119
runner: macos-13
144120
py: 'cpython-3.8'
@@ -152,10 +128,6 @@ jobs:
152128
runner: macos-13
153129
py: 'cpython-3.9'
154130
optimizations: 'debug'
155-
- target_triple: 'x86_64-apple-darwin'
156-
runner: macos-13
157-
py: 'cpython-3.9'
158-
optimizations: 'lto'
159131
- target_triple: 'x86_64-apple-darwin'
160132
runner: macos-13
161133
py: 'cpython-3.9'
@@ -169,10 +141,6 @@ jobs:
169141
runner: macos-13
170142
py: 'cpython-3.10'
171143
optimizations: 'debug'
172-
- target_triple: 'x86_64-apple-darwin'
173-
runner: macos-13
174-
py: 'cpython-3.10'
175-
optimizations: 'lto'
176144
- target_triple: 'x86_64-apple-darwin'
177145
runner: macos-13
178146
py: 'cpython-3.10'
@@ -186,10 +154,6 @@ jobs:
186154
runner: macos-13
187155
py: 'cpython-3.11'
188156
optimizations: 'debug'
189-
- target_triple: 'x86_64-apple-darwin'
190-
runner: macos-13
191-
py: 'cpython-3.11'
192-
optimizations: 'lto'
193157
- target_triple: 'x86_64-apple-darwin'
194158
runner: macos-13
195159
py: 'cpython-3.11'
@@ -203,10 +167,6 @@ jobs:
203167
runner: macos-13
204168
py: 'cpython-3.12'
205169
optimizations: 'debug'
206-
- target_triple: 'x86_64-apple-darwin'
207-
runner: macos-13
208-
py: 'cpython-3.12'
209-
optimizations: 'lto'
210170
- target_triple: 'x86_64-apple-darwin'
211171
runner: macos-13
212172
py: 'cpython-3.12'

‎.github/workflows/linux.yml

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -420,10 +420,6 @@ jobs:
420420
py: 'cpython-3.8'
421421
optimizations: 'debug'
422422
run: true
423-
- target_triple: 'x86_64-unknown-linux-gnu'
424-
py: 'cpython-3.8'
425-
optimizations: 'lto'
426-
run: true
427423
- target_triple: 'x86_64-unknown-linux-gnu'
428424
py: 'cpython-3.8'
429425
optimizations: 'pgo'
@@ -437,10 +433,6 @@ jobs:
437433
py: 'cpython-3.9'
438434
optimizations: 'debug'
439435
run: true
440-
- target_triple: 'x86_64-unknown-linux-gnu'
441-
py: 'cpython-3.9'
442-
optimizations: 'lto'
443-
run: true
444436
- target_triple: 'x86_64-unknown-linux-gnu'
445437
py: 'cpython-3.9'
446438
optimizations: 'pgo'
@@ -454,10 +446,6 @@ jobs:
454446
py: 'cpython-3.10'
455447
optimizations: 'debug'
456448
run: true
457-
- target_triple: 'x86_64-unknown-linux-gnu'
458-
py: 'cpython-3.10'
459-
optimizations: 'lto'
460-
run: true
461449
- target_triple: 'x86_64-unknown-linux-gnu'
462450
py: 'cpython-3.10'
463451
optimizations: 'pgo'
@@ -471,10 +459,6 @@ jobs:
471459
py: 'cpython-3.11'
472460
optimizations: 'debug'
473461
run: true
474-
- target_triple: 'x86_64-unknown-linux-gnu'
475-
py: 'cpython-3.11'
476-
optimizations: 'lto'
477-
run: true
478462
- target_triple: 'x86_64-unknown-linux-gnu'
479463
py: 'cpython-3.11'
480464
optimizations: 'pgo'
@@ -488,10 +472,6 @@ jobs:
488472
py: 'cpython-3.12'
489473
optimizations: 'debug'
490474
run: true
491-
- target_triple: 'x86_64-unknown-linux-gnu'
492-
py: 'cpython-3.12'
493-
optimizations: 'lto'
494-
run: true
495475
- target_triple: 'x86_64-unknown-linux-gnu'
496476
py: 'cpython-3.12'
497477
optimizations: 'pgo'
@@ -505,10 +485,6 @@ jobs:
505485
py: 'cpython-3.9'
506486
optimizations: 'debug'
507487
run: true
508-
- target_triple: 'x86_64_v2-unknown-linux-gnu'
509-
py: 'cpython-3.9'
510-
optimizations: 'lto'
511-
run: true
512488
- target_triple: 'x86_64_v2-unknown-linux-gnu'
513489
py: 'cpython-3.9'
514490
optimizations: 'pgo'
@@ -522,10 +498,6 @@ jobs:
522498
py: 'cpython-3.10'
523499
optimizations: 'debug'
524500
run: true
525-
- target_triple: 'x86_64_v2-unknown-linux-gnu'
526-
py: 'cpython-3.10'
527-
optimizations: 'lto'
528-
run: true
529501
- target_triple: 'x86_64_v2-unknown-linux-gnu'
530502
py: 'cpython-3.10'
531503
optimizations: 'pgo'
@@ -539,10 +511,6 @@ jobs:
539511
py: 'cpython-3.11'
540512
optimizations: 'debug'
541513
run: true
542-
- target_triple: 'x86_64_v2-unknown-linux-gnu'
543-
py: 'cpython-3.11'
544-
optimizations: 'lto'
545-
run: true
546514
- target_triple: 'x86_64_v2-unknown-linux-gnu'
547515
py: 'cpython-3.11'
548516
optimizations: 'pgo'
@@ -556,10 +524,6 @@ jobs:
556524
py: 'cpython-3.12'
557525
optimizations: 'debug'
558526
run: true
559-
- target_triple: 'x86_64_v2-unknown-linux-gnu'
560-
py: 'cpython-3.12'
561-
optimizations: 'lto'
562-
run: true
563527
- target_triple: 'x86_64_v2-unknown-linux-gnu'
564528
py: 'cpython-3.12'
565529
optimizations: 'pgo'
@@ -573,10 +537,6 @@ jobs:
573537
py: 'cpython-3.9'
574538
optimizations: 'debug'
575539
run: true
576-
- target_triple: 'x86_64_v3-unknown-linux-gnu'
577-
py: 'cpython-3.9'
578-
optimizations: 'lto'
579-
run: true
580540
- target_triple: 'x86_64_v3-unknown-linux-gnu'
581541
py: 'cpython-3.9'
582542
optimizations: 'pgo'
@@ -590,10 +550,6 @@ jobs:
590550
py: 'cpython-3.10'
591551
optimizations: 'debug'
592552
run: true
593-
- target_triple: 'x86_64_v3-unknown-linux-gnu'
594-
py: 'cpython-3.10'
595-
optimizations: 'lto'
596-
run: true
597553
- target_triple: 'x86_64_v3-unknown-linux-gnu'
598554
py: 'cpython-3.10'
599555
optimizations: 'pgo'
@@ -607,10 +563,6 @@ jobs:
607563
py: 'cpython-3.11'
608564
optimizations: 'debug'
609565
run: true
610-
- target_triple: 'x86_64_v3-unknown-linux-gnu'
611-
py: 'cpython-3.11'
612-
optimizations: 'lto'
613-
run: true
614566
- target_triple: 'x86_64_v3-unknown-linux-gnu'
615567
py: 'cpython-3.11'
616568
optimizations: 'pgo'
@@ -624,10 +576,6 @@ jobs:
624576
py: 'cpython-3.12'
625577
optimizations: 'debug'
626578
run: true
627-
- target_triple: 'x86_64_v3-unknown-linux-gnu'
628-
py: 'cpython-3.12'
629-
optimizations: 'lto'
630-
run: true
631579
- target_triple: 'x86_64_v3-unknown-linux-gnu'
632580
py: 'cpython-3.12'
633581
optimizations: 'pgo'

‎src/release.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pub static RELEASE_TRIPLES: Lazy<BTreeMap<&'static str, TripleRelease>> = Lazy::
2828
let mut h = BTreeMap::new();
2929

3030
// macOS.
31-
let macos_suffixes = vec!["debug", "lto", "pgo", "pgo+lto"];
31+
let macos_suffixes = vec!["debug", "pgo", "pgo+lto"];
3232
h.insert(
3333
"aarch64-apple-darwin",
3434
TripleRelease {
@@ -84,7 +84,7 @@ pub static RELEASE_TRIPLES: Lazy<BTreeMap<&'static str, TripleRelease>> = Lazy::
8484
);
8585

8686
// Linux.
87-
let linux_suffixes_pgo = vec!["debug", "lto", "pgo", "pgo+lto"];
87+
let linux_suffixes_pgo = vec!["debug", "pgo", "pgo+lto"];
8888
let linux_suffixes_nopgo = vec!["debug", "lto", "noopt"];
8989

9090
h.insert(

0 commit comments

Comments
 (0)