Skip to content

Commit e61ecf6

Browse files
dmitshurgopherbot
authored andcommitted
main.star: rewrite regexp for files related to vendored code
We have a recent data point showing the regexp added in CL 547596 isn't working as intended: no longtest builder was started in CL 593684 even though it modified vendored files. I suspect the problem was that {path1,path2} is pseudo-syntax we use in Go issue titles and such, but it's not a valid regexp pattern. Use one with a capturing group like (path1|path2) instead. Also generalize the pattern such that it works even if there is a new module, something other than cmd or std. Such changes are rare enough that we'd want a longtest builder to always run. Do the same for ssacheck while here. For golang/go#42661. Change-Id: I6d52193bbbd46e4e4a990356a01261f63338e5f7 Reviewed-on: https://go-review.googlesource.com/c/build/+/594615 Reviewed-by: Dmitri Shuralyov <[email protected]> Auto-Submit: Dmitri Shuralyov <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Michael Knyszek <[email protected]>
1 parent a1a679d commit e61ecf6

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

generated/commit-queue.cfg

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27053,7 +27053,7 @@ config_groups {
2705327053
location_filters {
2705427054
gerrit_host_regexp: "go-review.googlesource.com"
2705527055
gerrit_project_regexp: "^go$"
27056-
path_regexp: "src/cmd/compile/internal/{ssa,ssagen}/.+"
27056+
path_regexp: "src/cmd/compile/internal/(ssa|ssagen)/.+"
2705727057
}
2705827058
}
2705927059
builders {
@@ -27834,7 +27834,7 @@ config_groups {
2783427834
location_filters {
2783527835
gerrit_host_regexp: "go-review.googlesource.com"
2783627836
gerrit_project_regexp: "^go$"
27837-
path_regexp: "src/cmd/compile/internal/{ssa,ssagen}/.+"
27837+
path_regexp: "src/cmd/compile/internal/(ssa|ssagen)/.+"
2783827838
}
2783927839
}
2784027840
builders {
@@ -28615,7 +28615,7 @@ config_groups {
2861528615
location_filters {
2861628616
gerrit_host_regexp: "go-review.googlesource.com"
2861728617
gerrit_project_regexp: "^go$"
28618-
path_regexp: "src/cmd/compile/internal/{ssa,ssagen}/.+"
28618+
path_regexp: "src/cmd/compile/internal/(ssa|ssagen)/.+"
2861928619
}
2862028620
}
2862128621
builders {
@@ -29340,12 +29340,12 @@ config_groups {
2934029340
location_filters {
2934129341
gerrit_host_regexp: "go-review.googlesource.com"
2934229342
gerrit_project_regexp: "^go$"
29343-
path_regexp: "src/{,cmd/}go[.]{mod,sum}"
29343+
path_regexp: "src/.+/go[.](mod|sum)"
2934429344
}
2934529345
location_filters {
2934629346
gerrit_host_regexp: "go-review.googlesource.com"
2934729347
gerrit_project_regexp: "^go$"
29348-
path_regexp: "src/{,cmd/}vendor/.+"
29348+
path_regexp: "src/.+/vendor/.+"
2934929349
}
2935029350
location_filters {
2935129351
gerrit_host_regexp: "go-review.googlesource.com"
@@ -29387,12 +29387,12 @@ config_groups {
2938729387
location_filters {
2938829388
gerrit_host_regexp: "go-review.googlesource.com"
2938929389
gerrit_project_regexp: "^go$"
29390-
path_regexp: "src/{,cmd/}go[.]{mod,sum}"
29390+
path_regexp: "src/.+/go[.](mod|sum)"
2939129391
}
2939229392
location_filters {
2939329393
gerrit_host_regexp: "go-review.googlesource.com"
2939429394
gerrit_project_regexp: "^go$"
29395-
path_regexp: "src/{,cmd/}vendor/.+"
29395+
path_regexp: "src/.+/vendor/.+"
2939629396
}
2939729397
location_filters {
2939829398
gerrit_host_regexp: "go-review.googlesource.com"
@@ -29411,12 +29411,12 @@ config_groups {
2941129411
location_filters {
2941229412
gerrit_host_regexp: "go-review.googlesource.com"
2941329413
gerrit_project_regexp: "^go$"
29414-
path_regexp: "src/{,cmd/}go[.]{mod,sum}"
29414+
path_regexp: "src/.+/go[.](mod|sum)"
2941529415
}
2941629416
location_filters {
2941729417
gerrit_host_regexp: "go-review.googlesource.com"
2941829418
gerrit_project_regexp: "^go$"
29419-
path_regexp: "src/{,cmd/}vendor/.+"
29419+
path_regexp: "src/.+/vendor/.+"
2942029420
}
2942129421
location_filters {
2942229422
gerrit_host_regexp: "go-review.googlesource.com"
@@ -29462,7 +29462,7 @@ config_groups {
2946229462
location_filters {
2946329463
gerrit_host_regexp: "go-review.googlesource.com"
2946429464
gerrit_project_regexp: "^go$"
29465-
path_regexp: "src/cmd/compile/internal/{ssa,ssagen}/.+"
29465+
path_regexp: "src/cmd/compile/internal/(ssa|ssagen)/.+"
2946629466
}
2946729467
}
2946829468
builders {
@@ -29528,12 +29528,12 @@ config_groups {
2952829528
location_filters {
2952929529
gerrit_host_regexp: "go-review.googlesource.com"
2953029530
gerrit_project_regexp: "^go$"
29531-
path_regexp: "src/{,cmd/}go[.]{mod,sum}"
29531+
path_regexp: "src/.+/go[.](mod|sum)"
2953229532
}
2953329533
location_filters {
2953429534
gerrit_host_regexp: "go-review.googlesource.com"
2953529535
gerrit_project_regexp: "^go$"
29536-
path_regexp: "src/{,cmd/}vendor/.+"
29536+
path_regexp: "src/.+/vendor/.+"
2953729537
}
2953829538
location_filters {
2953929539
gerrit_host_regexp: "go-review.googlesource.com"
@@ -29703,12 +29703,12 @@ config_groups {
2970329703
location_filters {
2970429704
gerrit_host_regexp: "go-review.googlesource.com"
2970529705
gerrit_project_regexp: "^go$"
29706-
path_regexp: "src/{,cmd/}go[.]{mod,sum}"
29706+
path_regexp: "src/.+/go[.](mod|sum)"
2970729707
}
2970829708
location_filters {
2970929709
gerrit_host_regexp: "go-review.googlesource.com"
2971029710
gerrit_project_regexp: "^go$"
29711-
path_regexp: "src/{,cmd/}vendor/.+"
29711+
path_regexp: "src/.+/vendor/.+"
2971229712
}
2971329713
location_filters {
2971429714
gerrit_host_regexp: "go-review.googlesource.com"

main.star

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -804,8 +804,8 @@ RUN_MODS = dict(
804804
"build": [],
805805
"go": [
806806
# Enable longtest builders on go against tip if files related to vendored code are modified.
807-
"src/{,cmd/}go[.]{mod,sum}",
808-
"src/{,cmd/}vendor/.+",
807+
"src/.+/go[.](mod|sum)",
808+
"src/.+/vendor/.+",
809809
"src/.+_bundle.go",
810810
# Enable longtest builders on go against tip if files in the crypto/tls tree are modified,
811811
# so that the BoGo test suite is run.
@@ -912,7 +912,7 @@ RUN_MODS = dict(
912912
ssacheck = make_run_mod(
913913
add_props = {"compile_only": True},
914914
add_env = {"GO_GCFLAGS": "-d=ssa/check/on"},
915-
enabled = define_for_go_postsubmit_or_presubmit_with_filters(["src/cmd/compile/internal/{ssa,ssagen}/.+"]),
915+
enabled = define_for_go_postsubmit_or_presubmit_with_filters(["src/cmd/compile/internal/(ssa|ssagen)/.+"]),
916916
),
917917

918918
# Build and test with the staticlockranking GOEXPERIMENT, which validates the runtime's

0 commit comments

Comments
 (0)