Skip to content

Commit 0613da6

Browse files
[merge] merge main and API update(s)
2 parents f2c390c + 951f759 commit 0613da6

70 files changed

Lines changed: 1829 additions & 1063 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/buildomat/jobs/linux.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#:
33
#: name = "linux"
44
#: variety = "basic"
5-
#: target = "ubuntu-24.04"
5+
#: target = "ubuntu-22.04"
66
#: rust_toolchain = "stable"
77
#: output_rules = [
88
#: "/work/debug/*",
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/bin/bash
2+
#:
3+
#: name = "no-omicron-deps-in-client-crates"
4+
#: variety = "basic"
5+
#: target = "helios-2.0"
6+
#: rust_toolchain = "stable"
7+
#:
8+
9+
# The client and api-types crates are consumed by omicron. Maghemite
10+
# also consumes omicron. For the maghemite crates that omicron consumes
11+
# we cannot have omicron dependencies as this leads to a hot mess for
12+
# integration.
13+
14+
function omicron_dep_check {
15+
echo "checking $1"
16+
set -e
17+
pushd "$1"
18+
set +e
19+
tree_output=$(cargo tree -e normal --all-features)
20+
if grep omicron <<< "${tree_output}"; then
21+
echo "$1 may not depend on omicron"
22+
exit 1
23+
fi
24+
popd
25+
}
26+
27+
omicron_dep_check mg-admin-client
28+
omicron_dep_check ddm-admin-client
29+
omicron_dep_check ddm-api-types
30+
omicron_dep_check mg-api-types
31+
omicron_dep_check mg-api-types/versions

0 commit comments

Comments
 (0)