Skip to content

Commit aaec214

Browse files
bors[bot]asomers
andauthored
Merge #1513
1513: Check Dragonfly BSD and OpenBSD in CI r=asomers a=asomers Build, but don't test, for these operating systems. Thanks to `@rtzoeller` for the tip. Also, fix the OpenBSD build. Co-authored-by: Alan Somers <asomers@gmail.com>
2 parents 1e8c895 + 3a2163a commit aaec214

File tree

4 files changed

+33
-4
lines changed

4 files changed

+33
-4
lines changed

.cirrus.yml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@ env:
1010
TOOL: cargo
1111
# The MSRV
1212
TOOLCHAIN: 1.46.0
13+
ZFLAGS:
1314

1415
# Tests that don't require executing the build binaries
1516
build: &BUILD
1617
build_script:
1718
- . $HOME/.cargo/env || true
18-
- $TOOL +$TOOLCHAIN $BUILD --target $TARGET --all-targets
19-
- $TOOL +$TOOLCHAIN doc --no-deps --target $TARGET
19+
- $TOOL +$TOOLCHAIN $BUILD $ZFLAGS --target $TARGET --all-targets
20+
- $TOOL +$TOOLCHAIN doc $ZFLAGS --no-deps --target $TARGET
2021

2122
# Tests that do require executing the binaries
2223
test: &TEST
@@ -226,6 +227,26 @@ task:
226227
<< : *BUILD
227228
before_cache_script: rm -rf $CARGO_HOME/registry/index
228229

230+
# Rust Tier 3 targets can't use Rustup
231+
task:
232+
container:
233+
image: rustlang/rust:nightly
234+
env:
235+
BUILD: check
236+
TOOLCHAIN: nightly
237+
ZFLAGS: -Zbuild-std
238+
matrix:
239+
- name: DragonFly BSD x86_64
240+
env:
241+
TARGET: x86_64-unknown-dragonfly
242+
- name: OpenBSD x86_64
243+
env:
244+
TARGET: x86_64-unknown-openbsd
245+
setup_script:
246+
- rustup component add rust-src
247+
<< : *BUILD
248+
before_cache_script: rm -rf $CARGO_HOME/registry/index
249+
229250
# Test that we can build with the lowest version of all dependencies.
230251
# "cargo test" doesn't work because some of our dev-dependencies, like
231252
# rand, can't build with their own minimal dependencies.

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,10 @@ Tier 2:
7979

8080
Tier 3:
8181
* x86_64-fuchsia
82-
* x86_64-unknown-redox
82+
* x86_64-unknown-dragonfly
8383
* x86_64-unknown-linux-gnux32
84+
* x86_64-unknown-openbsd
85+
* x86_64-unknown-redox
8486

8587
## Usage
8688

bors.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ status = [
44
"Android armv7",
55
"Android i686",
66
"Android x86_64",
7+
"DragonFly BSD x86_64",
78
"FreeBSD amd64 & i686",
89
"Fuchsia x86_64",
910
"Linux MIPS",
@@ -25,6 +26,7 @@ status = [
2526
"Linux x86_64",
2627
"Minver",
2728
"NetBSD x86_64",
29+
"OpenBSD x86_64",
2830
"OSX x86_64",
2931
"Redox x86_64",
3032
"Rust Stable",

src/sys/resource.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ libc_enum! {
4949
), repr(i32))]
5050
#[non_exhaustive]
5151
pub enum Resource {
52-
#[cfg(not(any(target_os = "netbsd", target_os = "freebsd")))]
52+
#[cfg(not(any(
53+
target_os = "freebsd",
54+
target_os = "netbsd",
55+
target_os = "openbsd"
56+
)))]
5357
/// The maximum amount (in bytes) of virtual memory the process is
5458
/// allowed to map.
5559
RLIMIT_AS,

0 commit comments

Comments
 (0)