Skip to content

Commit 59a526a

Browse files
Merge remote-tracking branch 'remotes/from/ce/release/1.21.x' into release/1.21.x
2 parents 29892ad + 1c05b39 commit 59a526a

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

tools/pipeline/internal/pkg/changed/checkers.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,9 @@ func FileGroupCheckerEnterprise(ctx context.Context, file *File) FileGroups {
178178
switch {
179179
case
180180
// Short circuit for test and release files
181+
hasBaseDir(name, filepath.Join(".release")),
181182
hasBaseDir(name, filepath.Join("enos", "modules")),
182-
hasBaseDir(name, filepath.Join(".release")):
183+
hasBaseDir(name, filepath.Join("scripts", "docker")):
183184
return nil
184185
}
185186

tools/pipeline/internal/pkg/changed/checkers_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ func TestFileGroupDefaultCheckers(t *testing.T) {
5959
"scripts/cross/Dockerfile-ent-hsm": {FileGroupEnterprise, FileGroupPipeline},
6060
"scripts/dev/hsm/README.md": {FileGroupEnterprise, FileGroupPipeline},
6161
"scripts/dist-ent.sh": {FileGroupEnterprise, FileGroupPipeline},
62+
"scripts/docker/docker-entrypoint.sh": {FileGroupPipeline},
6263
"scripts/testing/test-vault-license.sh": {FileGroupEnterprise, FileGroupPipeline},
6364
"scripts/testing/upgrade/README.md": {FileGroupEnterprise, FileGroupPipeline},
6465
"sdk/database/dbplugin/v5/proto/database_ent.pb.go": {FileGroupGoApp, FileGroupEnterprise},

0 commit comments

Comments
 (0)