Skip to content

Commit 8fec414

Browse files
Mike KleinSkia Commit-Bot
Mike Klein
authored and
Skia Commit-Bot
committed
Reland "roll clang_win"
This is a reland of 3bf8e40 Original change's description: > roll clang_win > > Change-Id: Ide83513b28ac982e24dcb73c9f5766df7531bc47 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260810 > Reviewed-by: Brian Osman <brianosman@google.com> > Commit-Queue: Mike Klein <mtklein@google.com> Change-Id: I504db10e17e7b79284b1e222fb10a059801fedd4 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260878 Reviewed-by: Mike Klein <mtklein@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
1 parent cdb0e8f commit 8fec414

File tree

3 files changed

+29
-25
lines changed

3 files changed

+29
-25
lines changed

‎infra/bots/assets/clang_win/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10
1+
14

‎infra/bots/assets/clang_win/create.py‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,17 @@
1616
import utils
1717

1818

19-
# Copied from CLANG_REVISION here:
20-
# https://cs.chromium.org/chromium/src/tools/clang/scripts/update.py
21-
CLANG_REVISION = '357692'
22-
CLANG_SUB_REVISION = '1'
23-
CLANG_PKG_VERSION = '%s-%s' % (CLANG_REVISION, CLANG_SUB_REVISION)
19+
# Copied from https://cs.chromium.org/chromium/src/tools/clang/scripts/update.py
20+
CLANG_REVISION = 'c2443155a0fb245c8f17f2c1c72b6ea391e86e81'
21+
CLANG_SVN_REVISION = 'n332890'
22+
CLANG_SUB_REVISION = 1
23+
24+
PACKAGE_VERSION = '%s-%s-%s' % (CLANG_SVN_REVISION, CLANG_REVISION[:8],
25+
CLANG_SUB_REVISION)
26+
# (End copying)
27+
2428
GS_URL = ('https://commondatastorage.googleapis.com/chromium-browser-clang'
25-
'/Win/clang-%s.tgz' % CLANG_PKG_VERSION)
29+
'/Win/clang-%s.tgz' % PACKAGE_VERSION)
2630

2731

2832
def create_asset(target_dir):

‎infra/bots/tasks.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10530,7 +10530,7 @@
1053010530
{
1053110531
"name": "skia/bots/clang_win",
1053210532
"path": "clang_win",
10533-
"version": "version:10"
10533+
"version": "version:14"
1053410534
}
1053510535
],
1053610536
"command": [
@@ -10606,7 +10606,7 @@
1060610606
{
1060710607
"name": "skia/bots/clang_win",
1060810608
"path": "clang_win",
10609-
"version": "version:10"
10609+
"version": "version:14"
1061010610
}
1061110611
],
1061210612
"command": [
@@ -10682,7 +10682,7 @@
1068210682
{
1068310683
"name": "skia/bots/clang_win",
1068410684
"path": "clang_win",
10685-
"version": "version:10"
10685+
"version": "version:14"
1068610686
}
1068710687
],
1068810688
"command": [
@@ -10758,7 +10758,7 @@
1075810758
{
1075910759
"name": "skia/bots/clang_win",
1076010760
"path": "clang_win",
10761-
"version": "version:10"
10761+
"version": "version:14"
1076210762
}
1076310763
],
1076410764
"command": [
@@ -10909,7 +10909,7 @@
1090910909
{
1091010910
"name": "skia/bots/clang_win",
1091110911
"path": "clang_win",
10912-
"version": "version:10"
10912+
"version": "version:14"
1091310913
}
1091410914
],
1091510915
"command": [
@@ -10985,7 +10985,7 @@
1098510985
{
1098610986
"name": "skia/bots/clang_win",
1098710987
"path": "clang_win",
10988-
"version": "version:10"
10988+
"version": "version:14"
1098910989
}
1099010990
],
1099110991
"command": [
@@ -11061,7 +11061,7 @@
1106111061
{
1106211062
"name": "skia/bots/clang_win",
1106311063
"path": "clang_win",
11064-
"version": "version:10"
11064+
"version": "version:14"
1106511065
}
1106611066
],
1106711067
"command": [
@@ -11137,7 +11137,7 @@
1113711137
{
1113811138
"name": "skia/bots/clang_win",
1113911139
"path": "clang_win",
11140-
"version": "version:10"
11140+
"version": "version:14"
1114111141
}
1114211142
],
1114311143
"command": [
@@ -11213,7 +11213,7 @@
1121311213
{
1121411214
"name": "skia/bots/clang_win",
1121511215
"path": "clang_win",
11216-
"version": "version:10"
11216+
"version": "version:14"
1121711217
}
1121811218
],
1121911219
"command": [
@@ -11289,7 +11289,7 @@
1128911289
{
1129011290
"name": "skia/bots/clang_win",
1129111291
"path": "clang_win",
11292-
"version": "version:10"
11292+
"version": "version:14"
1129311293
},
1129411294
{
1129511295
"name": "skia/bots/opencl_headers",
@@ -11370,7 +11370,7 @@
1137011370
{
1137111371
"name": "skia/bots/clang_win",
1137211372
"path": "clang_win",
11373-
"version": "version:10"
11373+
"version": "version:14"
1137411374
}
1137511375
],
1137611376
"command": [
@@ -11446,7 +11446,7 @@
1144611446
{
1144711447
"name": "skia/bots/clang_win",
1144811448
"path": "clang_win",
11449-
"version": "version:10"
11449+
"version": "version:14"
1145011450
}
1145111451
],
1145211452
"command": [
@@ -11522,7 +11522,7 @@
1152211522
{
1152311523
"name": "skia/bots/clang_win",
1152411524
"path": "clang_win",
11525-
"version": "version:10"
11525+
"version": "version:14"
1152611526
}
1152711527
],
1152811528
"command": [
@@ -11598,7 +11598,7 @@
1159811598
{
1159911599
"name": "skia/bots/clang_win",
1160011600
"path": "clang_win",
11601-
"version": "version:10"
11601+
"version": "version:14"
1160211602
}
1160311603
],
1160411604
"command": [
@@ -11674,7 +11674,7 @@
1167411674
{
1167511675
"name": "skia/bots/clang_win",
1167611676
"path": "clang_win",
11677-
"version": "version:10"
11677+
"version": "version:14"
1167811678
}
1167911679
],
1168011680
"command": [
@@ -11750,7 +11750,7 @@
1175011750
{
1175111751
"name": "skia/bots/clang_win",
1175211752
"path": "clang_win",
11753-
"version": "version:10"
11753+
"version": "version:14"
1175411754
}
1175511755
],
1175611756
"command": [
@@ -11826,7 +11826,7 @@
1182611826
{
1182711827
"name": "skia/bots/clang_win",
1182811828
"path": "clang_win",
11829-
"version": "version:10"
11829+
"version": "version:14"
1183011830
}
1183111831
],
1183211832
"command": [
@@ -11902,7 +11902,7 @@
1190211902
{
1190311903
"name": "skia/bots/clang_win",
1190411904
"path": "clang_win",
11905-
"version": "version:10"
11905+
"version": "version:14"
1190611906
}
1190711907
],
1190811908
"command": [

0 commit comments

Comments
 (0)