Skip to content

Commit d1702af

Browse files
committed
Merge remote-tracking branch 'origin/fix-ci'
2 parents 39762ae + 9bb51b2 commit d1702af

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

.circleci/config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,15 @@ jobs:
117117
command: |
118118
nix-channel --update
119119
nix-build
120-
monterey:
120+
macos:
121121
macos:
122-
xcode: 14.2.0
122+
xcode: 15.4.0
123123
steps:
124124
- checkout
125125
- run:
126-
name: Install pkg-config
126+
name: Install packages
127127
command: |
128-
brew install pkg-config libtool autoconf automake
128+
brew install pkg-config libtool autoconf automake groff || true
129129
- run:
130130
name: Configure
131131
command: |
@@ -170,4 +170,4 @@ workflows:
170170
parameters:
171171
distro: [fedora37, fedora38, centos9, debian11, debian12, ubuntu2204, archlinux, opensuse15, alpine317]
172172
- nixos
173-
- monterey
173+
- macos

.cirrus.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@ task:
22
freebsd_instance:
33
cpu: 1
44
matrix:
5-
- image_family: freebsd-15-0-snap
6-
- image_family: freebsd-14-2
5+
- image_family: freebsd-15-0-amd64-zfs
6+
- image_family: freebsd-14-3
77
install_script: pkg install -y bash git autoconf automake libtool groff pkgconf
88
kernel_src_script: |
99
uname -r
10-
if [[ $(uname -r) == "14.2-RELEASE" ]]; then
11-
git clone --branch releng/14.2 https://git.FreeBSD.org/src.git /usr/src
12-
else
13-
git clone --branch main https://git.FreeBSD.org/src.git /usr/src
10+
if [[ $(uname -r) == "14.3-RELEASE" ]]; then
11+
git clone --branch releng/14.3 https://git.FreeBSD.org/src.git /usr/src
1412
fi;
1513
build_script:
1614
- ./Configure -n freebsd

0 commit comments

Comments
 (0)