Skip to content

Commit bc3a765

Browse files
dschoderrickstolee
authored andcommitted
Merge branch 'scalar-ci'
For ease of development, build and test `scalar`, too. Signed-off-by: Johannes Schindelin <[email protected]>
2 parents f5ada08 + 4e0ddc9 commit bc3a765

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on: [push, pull_request]
44

55
env:
66
DEVELOPER: 1
7+
INCLUDE_SCALAR: YesPlease
78

89
jobs:
910
ci-config:

ci/run-test-slice.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,9 @@ make --quiet -C t T="$(cd t &&
1717
# Run the git subtree tests only if main tests succeeded
1818
test 0 != "$1" || make -C contrib/subtree test
1919

20+
if test 0 = "$1" && test -n "$INCLUDE_SCALAR"
21+
then
22+
make -C contrib/scalar/t
23+
fi
24+
2025
check_unignored_build_artifacts

0 commit comments

Comments
 (0)