X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.cirrus.yml;h=c7bdd82db3653662e6e9e6ac52dbe6377a1f2c4d;hb=b7c76fdeaaa1f5e5580a6b28a54ced7d99d3178d;hp=58eab23afca75494d2eba913602ed56af6b0543a;hpb=74c4650bc26e4e1e73c6d09464451501b0c75d33;p=bup.git

diff --git a/.cirrus.yml b/.cirrus.yml
index 58eab23..c7bdd82 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,82 +1,66 @@
 
 task:
-  name: debian
+  name: debian 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 python3
     dev/system-info
-    adduser --disabled-password --gecos '' bup
-    chown -R bup:bup .
-    su -l bup -c "eatmydata make -j3 -C '$(pwd)' check"
+    BUP_PYTHON_CONFIG=python3-config ./configure --with-pylint=yes
+    make -j6 check
 
 task:
-  name: debian (root)
+  name: debian long-check
   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 python3
     dev/system-info
-    eatmydata 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 (xattr)
+  name: debian check
   container:
     image: debian:buster
-    cpu: 2
-    memory: 8
+    cpu: 4
+    memory: 2
   script: |
     set -xe
-    dev/prep-for-debianish-build python2 xattr
+    dev/prep-for-debianish-build python3
     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=python3-config check" \
+      "$(pwd)" | su -l bup
 
 task:
-  name: freebsd
+  name: freebsd check
   freebsd_instance:
-    image: freebsd-11-2-release-amd64
-    cpu: 2
-    memory: 8
+    image: freebsd-12-2-release-amd64
+    cpu: 4
+    memory: 4
   script: |
     set -xe
-    dev/prep-for-freebsd-build
+    dev/prep-for-freebsd-build python3
     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"
+    BUP_PYTHON_CONFIG=python3.8-config make -j6 check
 
 task:
-  name: macos
+  name: macos check
   osx_instance:
-    image: mojave-xcode-10.2
+    image: catalina-base
   script: |
     set -xe
-    dev/prep-for-macos-build
+    dev/prep-for-macos-build python3
+    export PKG_CONFIG_PATH=/usr/local/opt/readline/lib/pkgconfig
     dev/system-info
-    make -j3 check
-
-task:
-  name: debian (python 3 - under construction)
-  container:
-    image: debian:buster
-    cpu: 2
-    memory: 8
-  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"
+    make -j6 BUP_PYTHON_CONFIG=python3-config LDFLAGS=-L/usr/local/lib check