Skip to content

Commit e65e47f

Browse files
committed
Release script: Add NetBSD/x86_64 to the build matrix
1 parent f0ba0c2 commit e65e47f

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

release/Makefile

+5
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ CLINKING_macos = \
6969

7070
CLINKING_openbsd = $(CLINKING_macos)
7171
CLINKING_freebsd = $(CLINKING_macos)
72+
CLINKING_netbsd = $(CLINKING_macos)
7273

7374
CLINKING_windows = \
7475
-lunix -lmccs_stubs -lmccs_glpk_stubs -lsha_stubs -lopam_core_stubs \
@@ -86,6 +87,10 @@ EXPORTS_freebsd = \
8687
CPATH=/usr/local/include: \
8788
LIBRARY_PATH=/usr/local/lib: \
8889

90+
EXPORTS_netbsd = \
91+
CPATH=/usr/local/include: \
92+
LIBRARY_PATH=/usr/local/lib: \
93+
8994
EXTRA_CONFIGURE_ARGS_windows = --host=x86_64-w64-mingw32 --with-flexdll
9095

9196
%: opam-$(VERSION)-%

release/release.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ qemu_build() {
7676
fi
7777
${SSH} -p "${port}" root@localhost "${install}"
7878
make TAG="$TAG" JOBS="${JOBS}" qemu QEMU_PORT="${port}" REMOTE_MAKE="${make}" REMOTE_DIR="opam-release-$TAG"
79-
${SSH} -p "${port}" root@localhost "shutdown -p now"
79+
${SSH} -p "${port}" root@localhost "/sbin/shutdown -p now"
8080
}
8181

8282
make JOBS="${JOBS}" TAG="$TAG" "${OUTDIR}/opam-full-$TAG.tar.gz"
@@ -90,6 +90,7 @@ make JOBS="${JOBS}" TAG="$TAG" riscv64-linux
9090
[ -f "${OUTDIR}/opam-$TAG-x86_64-macos" ] || make TAG="$TAG" JOBS="${JOBS}" macos-local MACOS_ARCH=x86_64 REMOTE_DIR=opam-release-$TAG GIT_URL="$CWD/.."
9191
[ -f "${OUTDIR}/opam-$TAG-arm64-macos" ] || make TAG="$TAG" JOBS="${JOBS}" macos-local MACOS_ARCH=arm64 REMOTE_DIR=opam-release-$TAG GIT_URL="$CWD/.."
9292
[ -d ./qemu-base-images ] || git clone https://gitlab.com/kit-ty-kate/qemu-base-images.git
93+
[ -f "${OUTDIR}/opam-$TAG-x86_64-netbsd" ] || qemu_build 9996 NetBSD-10.0-amd64 "pkgin -y install gmake curl bzip2" gmake x86_64
9394
[ -f "${OUTDIR}/opam-$TAG-x86_64-openbsd" ] || qemu_build 9999 OpenBSD-7.6-amd64 "pkg_add gmake curl bzip2" gmake x86_64
9495
[ -f "${OUTDIR}/opam-$TAG-x86_64-freebsd" ] || qemu_build 9998 FreeBSD-14.1-RELEASE-amd64 "env IGNORE_OSVERSION=yes pkg install -y gmake curl bzip2" gmake x86_64
9596
[ -f "${OUTDIR}/opam-$TAG-x86_64-windows" ] || windows_build 9997 Windows-10-x86_64

0 commit comments

Comments
 (0)