oasis

commit: 0e57a5de27f143751703d683a4629050ae599628
parent 6512a4d74e8337016900ed50a5896eba1bb152bf
Author: Michael Forney <mforney@mforney.org>
Date:   Fri, 20 Mar 2020 18:19:26 -0700

Use builds.sr.ht for full CI build

Diffstat:
M
.build.yml
28
+++++++++++++++++++---------
D
.travis.yml
34
----------------------------------
M
README.md
2
+-

3 files changed, 20 insertions(+), 44 deletions(-)
diff --git a/.build.yml b/.build.yml
@@ -13,7 +13,6 @@ sources:
 secrets:
 - 0d338ffe-699f-4e82-85a0-3a4407172bed
 environment:
-  PATH: /home/build/x86_64-linux-musl-cross/bin:/home/build/oasis/out/pkg/texi2mdoc:/usr/sbin:/usr/bin:/sbin:/bin
   PAXREAD: bsdtar -x -f -
   GIT_SSH_COMMAND: ssh -o StrictHostKeyChecking=no
   SETS: core desktop devel extra media net
@@ -25,26 +24,37 @@ tasks:
     curl -LO http://musl.cc/x86_64-linux-musl-cross.tgz
     tar xzf x86_64-linux-musl-cross.tgz
 - build: |
+    PATH=$HOME/x86_64-linux-musl-cross/bin:$HOME/bin:$PATH
     cd oasis
     cat >config.lua <<EOF
+    return {
+    	builddir='out',
+    	fs=dofile 'fs.lua',
+    	target={platform='x86_64-linux-musl', cflags='-O2 -pipe', ldflags='-s -static', mc='6m'},
+    	host={cflags='-pipe', ldflags=''},
+    	repo={path='$HOME/root-x86_64.git', flags='--bare', tag='tree', branch=os.getenv('SET')},
+    }
+    EOF
+    # build everything
+    echo 'return {exclude={}}' >fs.lua
+    lua5.2 setup.lua
+    ninja out/pkg/texi2mdoc/texi2mdoc out/pkg/mc/bin/6m out/pkg/mc/bin/muse
+    mkdir $HOME/bin
+    cp out/pkg/texi2mdoc/texi2mdoc out/pkg/mc/bin/6m out/pkg/mc/bin/muse $HOME/bin
+    ninja
+    # build individual sets
+    cat >fs.lua <<EOF
     local sets = dofile 'sets.lua'
     local set = os.getenv('SET')
     local spec = {sets[set]}
     if set ~= 'devel' then
     	spec.exclude = {'^include/', '^lib/.*%.a$'}
     end
-    return {
-    	builddir='out',
-    	fs={spec},
-    	target={platform='x86_64-linux-musl', cflags='-O2 -pipe', ldflags='-s -static'},
-    	host={cflags='-pipe', ldflags=''},
-    	repo={path='$HOME/root-x86_64.git', flags='--bare', tag='tree', branch=set},
-    }
+    return {spec}
     EOF
     export SET
     for SET in $SETS ; do
         lua5.2 setup.lua
-        ninja out/pkg/texi2mdoc/texi2mdoc
         ninja commit
     done
 - deploy: |
diff --git a/.travis.yml b/.travis.yml
@@ -1,34 +0,0 @@
-language: c
-dist: trusty
-sudo: false
-git:
-  submodules: false
-addons:
-  apt:
-    packages:
-    - libwayland-dev
-    - lua5.2
-    - nasm
-    - pax
-install:
-- git clone --depth=1 https://github.com/michaelforney/oasis-toolchain /tmp/toolchain
-- PATH=$PATH:/tmp/toolchain/bin
-script:
-- git submodule update --init pkg/samurai/src
-- make -C pkg/samurai/src
-- |
-  echo 'return {
-  	builddir="out",
-  	fs={exclude={}},
-  	target={platform="x86_64-linux-musl", mc="6m", cflags="-O2 -pipe", ldflags="-s -static", pie=true},
-  	host={cflags="-pipe", ldflags=""},
-  	repo={path="$builddir/root.git", flags="--bare", tag="tree", branch="master"},
-  	tls="libressl",
-  	video_drivers={intel=true, nouveau=true}
-  }' > config.lua
-- lua setup.lua
-- ./pkg/samurai/src/samu out/pkg/openbsd/pax out/pkg/mc/bin/6m out/pkg/mc/bin/muse out/pkg/file/file out/pkg/texi2mdoc/texi2mdoc
-- mkdir /tmp/bin
-- cp out/pkg/openbsd/pax out/pkg/mc/bin/6m out/pkg/mc/bin/muse out/pkg/file/file out/pkg/texi2mdoc/texi2mdoc /tmp/bin
-- PATH=/tmp/bin:$PATH
-- ./pkg/samurai/src/samu commit
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # oasis
 
-[![Build Status](https://travis-ci.org/michaelforney/oasis.svg?branch=master)](https://travis-ci.org/michaelforney/oasis)
+[![builds.sr.ht status](https://builds.sr.ht/~mcf/oasis.svg)](https://builds.sr.ht/~mcf/oasis)
 
 oasis is a small linux system