diff --git a/.builds/epoll.yml b/.builds/linux.yml similarity index 100% rename from .builds/epoll.yml rename to .builds/linux.yml diff --git a/.builds/meson.yml b/.builds/meson.yml deleted file mode 100644 index a3a6324f..00000000 --- a/.builds/meson.yml +++ /dev/null @@ -1,14 +0,0 @@ -image: openbsd/latest -sources: -- https://git.sr.ht/~bakpakin/janet -packages: -- meson -tasks: -- build: | - cd janet - meson setup build --buildtype=release - cd build - ninja - ninja test - doas ninja install - doas jpm --verbose install circlet diff --git a/.builds/min_meson.yml b/.builds/min_meson.yml deleted file mode 100644 index e0fa4adb..00000000 --- a/.builds/min_meson.yml +++ /dev/null @@ -1,22 +0,0 @@ -image: openbsd/latest -sources: -- https://git.sr.ht/~bakpakin/janet -packages: -- meson -tasks: -- build: | - cd janet - meson setup build --buildtype=release - cd build - meson configure -Dsingle_threaded=true - meson configure -Dnanbox=false - meson configure -Ddynamic_modules=false - meson configure -Ddocstrings=false - meson configure -Dnet=false - meson configure -Dsourcemaps=false - meson configure -Dpeg=false - meson configure -Dassembler=false - meson configure -Dint_types=false - meson configure -Dtyped_array=false - meson configure -Dreduced_os=true - ninja # will not pass tests but should build diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml index 27ad30a1..1ee5033c 100644 --- a/.builds/openbsd.yml +++ b/.builds/openbsd.yml @@ -3,10 +3,48 @@ sources: - https://git.sr.ht/~bakpakin/janet packages: - gmake +- meson tasks: - build: | + # Makefile testing on BSD. cd janet gmake gmake test doas gmake install gmake test-install + doas gmake uninstall + rm -rf build # clean up + # meson min testing + meson setup build --buildtype=release + cd build + meson configure -Dsingle_threaded=true + meson configure -Dnanbox=false + meson configure -Ddynamic_modules=false + meson configure -Ddocstrings=false + meson configure -Dnet=false + meson configure -Dsourcemaps=false + meson configure -Dpeg=false + meson configure -Dassembler=false + meson configure -Dint_types=false + meson configure -Dtyped_array=false + meson configure -Dreduced_os=true + ninja # will not pass tests but should build + cd .. + rm -rf build # clean up + # meson (with prf) + meson setup build --buildtype=release + cd build + meson configure -Dprf=true + ninja + ninja test + cd .. + rm -rf build + # meson (default build) + cd janet + meson setup build --buildtype=release + cd build + ninja + ninja test + doas ninja install + doas jpm --verbose install circlet + diff --git a/.builds/prf_meson.yml b/.builds/prf_meson.yml deleted file mode 100644 index f9015ca5..00000000 --- a/.builds/prf_meson.yml +++ /dev/null @@ -1,15 +0,0 @@ -image: openbsd/latest -sources: -- https://git.sr.ht/~bakpakin/janet -packages: -- meson -tasks: -- build: | - cd janet - meson setup build --buildtype=release - cd build - meson configure -Dprf=true - ninja - ninja test - doas ninja install - doas jpm --verbose install circlet diff --git a/README.md b/README.md index 3af472a5..735c2733 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,6 @@ [![Build Status](https://travis-ci.org/janet-lang/janet.svg?branch=master)](https://travis-ci.org/janet-lang/janet) [![builds.sr.ht status](https://builds.sr.ht/~bakpakin/janet/commits/freebsd.yml.svg)](https://builds.sr.ht/~bakpakin/janet/commits/freebsd.yml?) [![builds.sr.ht status](https://builds.sr.ht/~bakpakin/janet/commits/openbsd.yml.svg)](https://builds.sr.ht/~bakpakin/janet/commits/openbsd.yml?) -[![builds.sr.ht status](https://builds.sr.ht/~bakpakin/janet/commits/meson.yml.svg)](https://builds.sr.ht/~bakpakin/janet/commits/meson.yml?) -[![builds.sr.ht status](https://builds.sr.ht/~bakpakin/janet/commits/meson_min.yml.svg)](https://builds.sr.ht/~bakpakin/janet/commits/meson_min.yml?) Janet logo