Skip to content

Commit

Permalink
fix: target_compatible_with excluding arm64 (#84)
Browse files Browse the repository at this point in the history
* fix: target_compatible_with excluding arm64

The 'ci: update ci and exclude windows' commit added
'target_compatible_with' arguments to some of the tests restricting them
to linux but it also forced amd64 instead of allowing the tests to run
in both linux/amd64 and linux/arm64.

Before this fix, I would get SKIPPED tests when testing on linux/arm64
and now all the tests run.

* chore: updating locks

Just doing 'bazel run' on the locks (except apt_security which is
lock-less) and runnign the tests for linux/amd64 and linux/arm64:

```
bazel run @bullseye//:lock
bazel run @shared_dependencies//:lock
bazel run @noble//:lock

bazel test //...
```

produces these changes, which seem to be, mostly,

* tabs vs 2 spaces in lock.json
* keys with '_' instead of '~'
* some tooling in MODULES.lock
  • Loading branch information
jjmaestro authored Sep 12, 2024
1 parent 96d68d4 commit 8a2174a
Show file tree
Hide file tree
Showing 8 changed files with 8,804 additions and 7,007 deletions.
1,441 changes: 1,440 additions & 1 deletion MODULE.bazel.lock

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions e2e/smoke/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,10 @@ container_structure_test(
"@platforms//cpu:x86_64": ["test_linux_amd64.yaml"],
}),
image = ":apt",
target_compatible_with = [
"@platforms//cpu:x86_64",
target_compatible_with = select({
"@platforms//cpu:x86_64": ["@platforms//cpu:x86_64"],
"@platforms//cpu:arm64": ["@platforms//cpu:arm64"],
}) + [
"@platforms//os:linux",
],
)
6 changes: 4 additions & 2 deletions examples/debian_shared_dependencies/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,10 @@ container_structure_test(
"@platforms//cpu:x86_64": ["test_linux_amd64.yaml"],
}),
image = ":apt",
target_compatible_with = [
"@platforms//cpu:x86_64",
target_compatible_with = select({
"@platforms//cpu:x86_64": ["@platforms//cpu:x86_64"],
"@platforms//cpu:arm64": ["@platforms//cpu:arm64"],
}) + [
"@platforms//os:linux",
],
)
Loading

0 comments on commit 8a2174a

Please sign in to comment.