Skip to content

Commit 1ea1132

Browse files
[mcast] default multicast feature across all crates + merge main (includes #189)
Enable multicast by default so the packaged artifacts include multicast support without requiring explicit feature flags at build time.
2 parents 3799229 + a9d4b82 commit 1ea1132

39 files changed

+24309
-1138
lines changed

.github/buildomat/jobs/image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ pfexec chown "$UID" /out
101101

102102
banner "P4 Codegen"
103103
# Add gcc-12 so the p4 compiler can find cpp
104-
PATH=/opt/gcc-12/bin:$PATH cargo xtask codegen --stages $TOFINO_STAGES
104+
PATH=/opt/gcc-12/bin:$PATH cargo xtask codegen --stages $TOFINO_STAGES --multicast
105105

106106
# Preserve all the diagnostics spit out by the compiler
107107
mkdir -p /out/p4c-diags

.github/buildomat/jobs/multicast-test.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,4 @@ set -o errexit
3030
set -o pipefail
3131
set -o xtrace
3232

33-
export MULTICAST=1
3433
source .github/buildomat/packet-test-common.sh

.github/buildomat/packet-test-common.sh

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,11 @@ export WS=$wd
88
MODEL_STARTUP_TIMEOUT=${MODEL_STARTUP_TIMEOUT:=5}
99
STARTUP_TIMEOUT=${STARTUP_TIMEOUT:=120}
1010

11-
if [ x$MULTICAST == x ]; then
12-
BUILD_FEATURES=tofino_asic
13-
CODEGEN_FEATURES=
14-
SWADM_FEATURES=
15-
else
16-
BUILD_FEATURES=tofino_asic,multicast
17-
CODEGEN_FEATURES=--multicast
18-
SWADM_FEATURES=--features=multicast
19-
fi
20-
11+
BUILD_FEATURES=tofino_asic
12+
13+
CODEGEN_FEATURES=--multicast
14+
SWADM_FEATURES="--features=multicast"
15+
2116
function cleanup {
2217
set +o errexit
2318
set +o pipefail

0 commit comments

Comments
 (0)