Skip to content

Commit a97cf12

Browse files
committed
Merge tokio-1.47.x (commit 670a907) into tokio-1.51.x (#8105)
2 parents bde3f20 + 670a907 commit a97cf12

2 files changed

Lines changed: 71 additions & 71 deletions

File tree

.cirrus.yml

Lines changed: 0 additions & 71 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,3 +1292,74 @@ jobs:
12921292
uses: ./.github/workflows/uring-kernel-version-test.yml
12931293
with:
12941294
kernel_version: ${{ matrix.kernel_version }}
1295+
1296+
freebsd-x86_64:
1297+
name: FreeBSD x86_64
1298+
needs: basics
1299+
runs-on: ubuntu-latest
1300+
steps:
1301+
- uses: actions/checkout@v6
1302+
- name: Test in FreeBSD
1303+
uses: vmactions/freebsd-vm@v1
1304+
with:
1305+
release: '14.4'
1306+
envs: "TOKIO_STABLE_FEATURES RUSTFLAGS"
1307+
prepare: |
1308+
pkg install -y curl
1309+
curl https://sh.rustup.rs -sSf --output rustup.sh
1310+
sh rustup.sh -y --profile minimal --default-toolchain ${{ env.rust_stable }}
1311+
run: |
1312+
. $HOME/.cargo/env
1313+
cargo test --workspace --features $TOKIO_STABLE_FEATURES
1314+
# Enable all unstable features except `io_uring` and `taskdump`,
1315+
# which are Linux-only features.
1316+
RUSTFLAGS="$RUSTFLAGS --cfg tokio_unstable" \
1317+
cargo test \
1318+
--features $TOKIO_STABLE_FEATURES,tracing
1319+
1320+
freebsd-docs:
1321+
name: FreeBSD docs
1322+
needs: basics
1323+
runs-on: ubuntu-latest
1324+
steps:
1325+
- uses: actions/checkout@v6
1326+
- name: Test in FreeBSD
1327+
uses: vmactions/freebsd-vm@v1
1328+
env:
1329+
RUSTFLAGS: --cfg docsrs --cfg tokio_unstable
1330+
RUSTDOCFLAGS: --cfg docsrs --cfg tokio_unstable -Dwarnings
1331+
with:
1332+
release: '14.4'
1333+
envs: "TOKIO_STABLE_FEATURES RUSTDOCFLAGS RUSTFLAGS"
1334+
prepare: |
1335+
pkg install -y curl
1336+
curl https://sh.rustup.rs -sSf --output rustup.sh
1337+
sh rustup.sh -y --profile minimal --default-toolchain ${{ env.rust_nightly }}
1338+
run: |
1339+
. $HOME/.cargo/env
1340+
# We use `--features $TOKIO_STABLE_FEATURES,io-uring,tracing` instead of
1341+
# `--all-features` to exclude `taskdump` and `io_uring`, which are Linux-only
1342+
# features.
1343+
cargo doc --lib --no-deps --features $TOKIO_STABLE_FEATURES,tracing \
1344+
--document-private-items
1345+
1346+
freebsd-i686:
1347+
name: FreeBSD i686
1348+
needs: basics
1349+
runs-on: ubuntu-latest
1350+
steps:
1351+
- uses: actions/checkout@v6
1352+
- name: Test in FreeBSD
1353+
uses: vmactions/freebsd-vm@v1
1354+
with:
1355+
release: '14.4'
1356+
envs: "TOKIO_STABLE_FEATURES RUSTFLAGS"
1357+
prepare: |
1358+
pkg install -y curl
1359+
curl https://sh.rustup.rs -sSf --output rustup.sh
1360+
sh rustup.sh -y --profile minimal --default-toolchain ${{ env.rust_stable }}
1361+
run: |
1362+
. $HOME/.cargo/env
1363+
rustup target add i686-unknown-freebsd
1364+
cargo test --workspace --features $TOKIO_STABLE_FEATURES \
1365+
--target i686-unknown-freebsd

0 commit comments

Comments
 (0)