Skip to content

Commit 3951370

Browse files
authored
Merge pull request #39 from k8sstormcenter/ddelnano/remove-tools-ci-pins-from-copybara
Remove `tools/` and `ci/` from copybara pin
2 parents e07abb0 + 8174141 commit 3951370

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

.github/workflows/copybara_pixie_oss.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ jobs:
2626
# This is only needed for the first copybara run (supplied via --last-rev ${sha} flag)
2727
run: >
2828
GIT_SSH_COMMAND='ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i /tmp/sshkey'
29-
./ci/run_copybara.sh tools/copybara/upstream_sync/copy.bara.sky
29+
./ci/private/run_copybara.sh tools/private/copybara/copy.bara.sky

tools/copybara/upstream_sync/copy.bara.sky renamed to tools/private/copybara/copy.bara.sky

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ ignored_dirs = [
9696
"src/api/go/pxapi/vizier.go", # mutation support
9797
"src/vizier/services/query_broker/**", # mutation and clickhouse changes to upstream
9898
"src/pixie_cli/BUILD.bazel", # fork customizations, see if this can be parameterized
99-
"tools/**",
10099
"WORKSPACE", # upstream misspelling
101100
]
102101

@@ -107,13 +106,14 @@ fork_only_files = [
107106
".github/workflows/perf_soc_attack.yaml",
108107
"PLATFORM.md",
109108
"bazel/external/rules_docker_pusher_cfg.patch",
110-
"ci/run_copybara.sh",
109+
"ci/private/**",
111110
"k8s/vizier/bootstrap/adaptive_export_*",
112111
"k8s/vizier/bootstrap/kustomization.yaml",
113112
"src/carnot/planner/ir/clickhouse_*",
114113
"src/vizier/services/adaptive_export/**",
115114
"src/vizier/services/metadata/local/**",
116115
"tools/licenses/BUILD.bazel",
116+
"tools/private/**",
117117
]
118118

119119
core.workflow(

0 commit comments

Comments
 (0)