Skip to content

Commit 28ccc09

Browse files
authored
Use Cirrus CI for NetBSD/OpenBSD (#130)
1 parent 913b236 commit 28ccc09

File tree

2 files changed

+33
-33
lines changed

2 files changed

+33
-33
lines changed

.cirrus.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ env:
44
CARGO_INCREMENTAL: '0'
55
CARGO_NET_GIT_FETCH_WITH_CLI: 'true'
66
CARGO_NET_RETRY: '10'
7+
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: 'sparse'
78
CARGO_TERM_COLOR: always
89
RUST_BACKTRACE: '1'
910
RUSTDOCFLAGS: -D warnings
@@ -27,3 +28,34 @@ freebsd_task:
2728
test_script:
2829
- . $HOME/.cargo/env
2930
- cargo test --target $TARGET
31+
32+
netbsd_task:
33+
name: test ($TARGET)
34+
compute_engine_instance:
35+
image_project: pg-ci-images
36+
# https://github.com/anarazel/pg-vm-images/blob/main/packer/netbsd.pkrvars.hcl
37+
image: family/pg-ci-netbsd-vanilla-9-3
38+
platform: netbsd
39+
env:
40+
TARGET: x86_64-unknown-netbsd
41+
setup_script:
42+
- pkgin -y install git
43+
- curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable
44+
test_script:
45+
- . $HOME/.cargo/env
46+
- cargo test
47+
48+
openbsd_task:
49+
name: test ($TARGET)
50+
compute_engine_instance:
51+
image_project: pg-ci-images
52+
# https://github.com/anarazel/pg-vm-images/blob/main/packer/openbsd.pkrvars.hcl
53+
image: family/pg-ci-openbsd-vanilla-7-2
54+
platform: openbsd
55+
env:
56+
TARGET: x86_64-unknown-openbsd
57+
setup_script:
58+
# OpenBSD is tier 3 target, so install rust from package manager instead of rustup
59+
- pkg_add git rust
60+
test_script:
61+
- cargo test

.github/workflows/ci.yml

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
run: rustup update stable
8080
- name: Install cross
8181
uses: taiki-e/install-action@cross
82-
# We don't test BSDs, since we already test them in Cirrus/vmactions.
82+
# We don't test BSDs, since we already test them in Cirrus.
8383
- name: Android
8484
if: startsWith(matrix.os, 'ubuntu')
8585
run: cross test --target arm-linux-androideabi
@@ -104,38 +104,6 @@ jobs:
104104
rustup target add x86_64-unknown-illumos
105105
cargo build --target x86_64-unknown-illumos
106106
107-
openbsd:
108-
runs-on: macos-12
109-
steps:
110-
- uses: actions/checkout@v3
111-
- name: Test OpenBSD
112-
id: test
113-
uses: vmactions/openbsd-vm@v0
114-
with:
115-
envs: CARGO_INCREMENTAL CARGO_NET_GIT_FETCH_WITH_CLI CARGO_NET_RETRY RUST_BACKTRACE RUSTFLAGS RUSTDOCFLAGS RUSTUP_MAX_RETRIES
116-
usesh: true
117-
# OpenBSD is tier 3 target, so install rust from package manager instead of rustup
118-
prepare: |
119-
pkg_add git rust
120-
run: |
121-
cargo test
122-
123-
dragonfly:
124-
runs-on: macos-12
125-
steps:
126-
- uses: actions/checkout@v3
127-
- name: Test Dragonfly BSD
128-
id: test
129-
uses: vmactions/dragonflybsd-vm@v0
130-
with:
131-
envs: CARGO_INCREMENTAL CARGO_NET_GIT_FETCH_WITH_CLI CARGO_NET_RETRY RUST_BACKTRACE RUSTFLAGS RUSTDOCFLAGS RUSTUP_MAX_RETRIES
132-
usesh: true
133-
# Dragonfly BSD is tier 3 target, so install rust from package manager instead of rustup
134-
prepare: |
135-
pkg install -y git rust
136-
run: |
137-
cargo test
138-
139107
msrv:
140108
runs-on: ${{ matrix.os }}
141109
strategy:

0 commit comments

Comments
 (0)