Skip to content

Commit f3db434

Browse files
committed
Cross.toml: Install tzdata in container
Linux tests require that now, as we now assume /usr/share/zoneinfo is present.
1 parent 49bb7b1 commit f3db434

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.github/workflows/CICD.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -654,10 +654,6 @@ jobs:
654654
;;
655655
esac
656656
outputs CARGO_TEST_OPTIONS
657-
# ** pass needed environment into `cross` container (iff `cross` not already configured via "Cross.toml")
658-
if [ "${CARGO_CMD}" = 'cross' ] && [ ! -e "Cross.toml" ] ; then
659-
printf "[build.env]\npassthrough = [\"CI\", \"RUST_BACKTRACE\", \"CARGO_TERM_COLOR\"]\n" > Cross.toml
660-
fi
661657
# * executable for `strip`?
662658
STRIP="strip"
663659
case ${{ matrix.job.target }} in

Cross.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# spell-checker:ignore (misc) dpkg noninteractive tzdata
2+
[build]
3+
pre-build = [
4+
"apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install tzdata",
5+
]
6+
[build.env]
7+
passthrough = ["CI", "RUST_BACKTRACE", "CARGO_TERM_COLOR"]

0 commit comments

Comments
 (0)