Mike Gerwitz

Activist for User Freedom

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml25
-rwxr-xr-xbootstrap10
2 files changed, 24 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a949957..f76fce9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,16 +4,14 @@ stages:
- build
- deploy
-before_script:
- - apt-get update
- - apt-get -y install --no-install-recommends texinfo texlive-latex-base
- - apt-get -y install nodejs
- - git submodule update --init --recursive
- - git clone https://gitlab.com/mikegerwitz/hoxsl
-
build:
stage: build
script:
+ - apt-get update
+ - apt-get -y install --no-install-recommends texinfo texlive-latex-base
+ - apt-get -y install nodejs
+ - git submodule update --init --recursive
+ - git clone https://gitlab.com/mikegerwitz/hoxsl
- export SAXON_CP=/usr/share/ant/lib/saxon9/saxon9he.jar
- autoreconf -fvi
- ./configure
@@ -24,6 +22,19 @@ build:
- doc/
expire_in: 30 min
+build-rust:
+ stage: build
+ image: rust:1.39
+ script:
+ - cd tamer
+ - ./bootstrap
+ - ./configure
+ - make check
+ artifacts:
+ paths:
+ - tamer/target
+ expire_in: 30 min
+
pages:
stage: deploy
script:
diff --git a/bootstrap b/bootstrap
index 3f7193c..0bb0932 100755
--- a/bootstrap
+++ b/bootstrap
@@ -25,10 +25,12 @@ export HOXSL="${HOXSL?Missing path to hoxsl}"
test "${1:-}" = -n || git submodule update --init --recursive
-cd progtest \
- && { which npm && npm install || true; } \
- && ./autogen.sh && ./configure \
- && cd - \
+(
+ cd progtest \
+ && { which npm && npm install || true; } \
+ && ./autogen.sh && ./configure
+) \
+ && ( cd tamer && ./bootstrap && ./configure && make check ) \
&& { test -e hoxsl || ln -s ../hoxsl; } \
&& autoreconf -fvi \
&& ./configure \