Skip to content

Commit 3ec114b

Browse files
ddelnanocosmic-copybara
authored andcommitted
Fix bug where cli manifests with AT_DARWIN_ARM64 ArtifactTypes fail to parse (pixie-io#2005)
Summary: Fix bug where cli manifests with `AT_DARWIN_ARM64` ArtifactTypes fail to parse This was an error I ran into when testing pixie-io#1997. You can see the failure output from the [following build](https://github.com/pixie-io/pixie/actions/runs/10705210930/job/29681122220?pr=1997) (also copied below). ``` INFO: Running command line: bazel-bin/src/utils/artifacts/manifest_updater/manifest_updater_/manifest_updater '--manifest_updates=/__w/pixie/pixie/manifest_updates.json' '--manifest_path=/__w/pixie/pixie/gh-pages/artifacts/manifest.json' time="2024-09-04T16:17:53Z" level=fatal msg="failed to read manifest updates" error="unknown value \"AT_DARWIN_ARM64\" for enum px.versions.ArtifactType" ``` Relevant Issues: pixie-io#1993 Type of change: /kind bugfix Test Plan: Built the manifest_updater binary and verified it no longer fails with a parse error ``` $ ./manifest_updater --manifest_updates manifest_updates.json --manifest_path=manifest.json $ ``` --------- Signed-off-by: Dom Del Nano <ddelnano@gmail.com> GitOrigin-RevId: afffb8e
1 parent 59c35e8 commit 3ec114b

4 files changed

Lines changed: 46 additions & 39 deletions

File tree

.arclint

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
"(^k8s/devinfra/prow/prowjob_customresourcedefinition.yaml$)",
1616
"(^k8s/operator/crd/base/px\\.dev_viziers\\.yaml$)",
1717
"(^private/users/)",
18-
"(^private\/.*\\.yaml)",
18+
"(^private\/credentials\/.*\\.sh)",
19+
"(^private\/credentials\/.*\\.sh)",
20+
"(^private\/credentials\/.*\\.yaml)",
1921
"(^src/operator/client/versioned/)",
2022
"(^src/operator/apis/px.dev/v1alpha1/zz_generated.deepcopy.go)",
2123
"(^src/stirling/bpf_tools/bcc_bpf/system-headers)",

ci/bazel_build_deps.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ function compute_targets() {
133133
fi
134134
done
135135

136-
targets+=("rdeps(//..., set(${changed_files[*]}))")
136+
targets+=("rdeps(//..., set(${changed_files[*]})) intersect //...")
137137
}
138138

139139
function check_bpf_trigger() {

src/shared/artifacts/versionspb/versions.pb.go

Lines changed: 41 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/shared/artifacts/versionspb/versions.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ enum ArtifactType {
3030
AT_UNKNOWN = 0;
3131
AT_LINUX_AMD64 = 1;
3232
AT_DARWIN_AMD64 = 2;
33+
AT_DARWIN_ARM64 = 3;
3334
AT_CONTAINER_SET_YAMLS = 50;
3435
AT_CONTAINER_SET_TEMPLATE_YAMLS = 60;
3536
AT_CONTAINER_SET_LINUX_AMD64 = 100;

0 commit comments

Comments
 (0)