Skip to content

Commit

Permalink
Fix bug where cli manifests with AT_DARWIN_ARM64 ArtifactTypes fail…
Browse files Browse the repository at this point in the history
… to parse (#2005)

Summary: Fix bug where cli manifests with `AT_DARWIN_ARM64`
ArtifactTypes fail to parse

This was an error I ran into when testing #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: #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 <[email protected]>
  • Loading branch information
ddelnano authored Sep 4, 2024
1 parent 9ae53a8 commit afffb8e
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 38 deletions.
2 changes: 1 addition & 1 deletion ci/bazel_build_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ function compute_targets() {
fi
done

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

function check_bpf_trigger() {
Expand Down
78 changes: 41 additions & 37 deletions src/shared/artifacts/versionspb/versions.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/shared/artifacts/versionspb/versions.proto
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ enum ArtifactType {
AT_UNKNOWN = 0;
AT_LINUX_AMD64 = 1;
AT_DARWIN_AMD64 = 2;
AT_DARWIN_ARM64 = 3;
AT_CONTAINER_SET_YAMLS = 50;
AT_CONTAINER_SET_TEMPLATE_YAMLS = 60;
AT_CONTAINER_SET_LINUX_AMD64 = 100;
Expand Down

0 comments on commit afffb8e

Please sign in to comment.