X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=.cirrus.yml;h=fd92f24cb7d15d3ebd7b7b1664d913d6c9566b62;hb=51e0158c85a3519be1b3bc5ac4f1349f5010923c;hp=a2fe9ccad984f94ab582fea143058894e1e43b95;hpb=77635bacb5e7ee16b45866cac096efeb5940c23a;p=bup.git

diff --git a/.cirrus.yml b/.cirrus.yml
index a2fe9cc..fd92f24 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,56 +1,109 @@
 
 task:
-  name: debian
+  name: debian (py2 check/lint root)
   container:
     image: debian:buster
-    cpu: 2
-    memory: 8
+    cpu: 4
+    memory: 2
   script: |
     set -xe
-    dev/prep-for-debianish-build
+    dev/prep-for-debianish-build python2
+    dev/system-info
+    BUP_PYTHON_CONFIG=python2.7-config ./configure --with-pylint=yes
+    make -j6 check
+
+task:
+  name: debian (py2 long-check)
+  container:
+    image: debian:buster
+    cpu: 4
+    memory: 2
+  script: |
+    set -xe
+    dev/prep-for-debianish-build python2
     dev/system-info
     adduser --disabled-password --gecos '' bup
     chown -R bup:bup .
-    su -l bup -c "eatmydata make -j3 -C '$(pwd)' check"
+    printf "make -j6 -C %q BUP_PYTHON_CONFIG=python2.7-config long-check" \
+      "$(pwd)" | su -l bup
 
 task:
-  name: freebsd
-  freebsd_instance:
-    image: freebsd-11-2-release-amd64
-    cpu: 2
-    memory: 8
+  name: debian (py2 check)
+  container:
+    image: debian:buster
+    cpu: 4
+    memory: 2
   script: |
     set -xe
-    dev/prep-for-freebsd-build
+    dev/prep-for-debianish-build python2
     dev/system-info
-    gmake -j3 check
-    # It looks like su might not work here...
-    #pw useradd -n bup -s /bin/sh -m -w no
-    #chown -R bup .
-    #su -l bup -c "gmake -j3 -C '$PWD' check"
+    adduser --disabled-password --gecos '' bup
+    chown -R bup:bup .
+    printf "make -j6 -C %q BUP_PYTHON_CONFIG=python2.7-config check" \
+      "$(pwd)" | su -l bup
 
 task:
-  name: macos
-  osx_instance:
-    image: mojave-xcode-10.2
+  name: debian (py3 check/lint root)
+  container:
+    image: debian:buster
+    cpu: 4
+    memory: 2
+  script: |
+    set -xe
+    dev/prep-for-debianish-build python3
+    dev/system-info
+    BUP_PYTHON_CONFIG=python3-config ./configure --with-pylint=yes
+    make -j6 check
+
+task:
+  name: debian (py3 long-check)
+  container:
+    image: debian:buster
+    cpu: 4
+    memory: 2
   script: |
     set -xe
-    dev/prep-for-macos-build
+    dev/prep-for-debianish-build python3
     dev/system-info
-    make -j3 check
+    adduser --disabled-password --gecos '' bup
+    chown -R bup:bup .
+    printf "make -j6 -C %q BUP_PYTHON_CONFIG=python3-config long-check" \
+      "$(pwd)" | su -l bup
 
 task:
-  name: debian (python 3 - under construction)
+  name: debian (py3 check)
   container:
     image: debian:buster
-    cpu: 2
-    memory: 8
+    cpu: 4
+    memory: 2
   script: |
     set -xe
     dev/prep-for-debianish-build python3
     dev/system-info
     adduser --disabled-password --gecos '' bup
     chown -R bup:bup .
-    testcmd='BUP_ALLOW_UNEXPECTED_PYTHON_VERSION=true PYTHON=python3'
-    testcmd="$testcmd eatmydata make -j3 -C '$(pwd)' check"
-    su -l bup -c "$testcmd"
+    printf "make -j6 -C %q BUP_PYTHON_CONFIG=python3-config check" \
+      "$(pwd)" | su -l bup
+
+task:
+  name: freebsd (py3 check)
+  freebsd_instance:
+    image: freebsd-12-2-release-amd64
+    cpu: 4
+    memory: 4
+  script: |
+    set -xe
+    dev/prep-for-freebsd-build python3
+    dev/system-info
+    BUP_PYTHON_CONFIG=python3.8-config make -j6 check
+
+task:
+  name: macos (py3 check)
+  osx_instance:
+    image: catalina-base
+  script: |
+    set -xe
+    dev/prep-for-macos-build python3
+    export PKG_CONFIG_PATH=/usr/local/opt/readline/lib/pkgconfig
+    dev/system-info
+    make -j6 BUP_PYTHON_CONFIG=python3-config LDFLAGS=-L/usr/local/lib check