X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=.cirrus.yml;h=d676e7c3f6e6169f87ec04a264561fff806179c4;hb=b8e90ee2882c7b93d6c8c8fb1ef4cc6ed00aa2b3;hp=8f1451a3b32f368991f8275449556503b542d328;hpb=1718f629224f859c4be05ae032b820d8ed74915f;p=bup.git

diff --git a/.cirrus.yml b/.cirrus.yml
index 8f1451a..d676e7c 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,82 +1,132 @@
 
 task:
-  name: debian (long)
+  name: debian (py2)
   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
+    eatmydata make -j6 PYTHON=python2 check
+
+task:
+  name: debian (long py2)
+  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 -j6 -C '$(pwd)' PYTHON=python2 long-check"
+
+task:
+  name: debian (root py2)
+  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)' long-check"
+    su -l bup -c "eatmydata make -j6 -C '$(pwd)' PYTHON=python2 check"
+
+task:
+  name: debian (py3)
+  container:
+    image: debian:buster
+    cpu: 4
+    memory: 2
+  script: |
+    set -xe
+    dev/prep-for-debianish-build python3
+    dev/system-info
+    eatmydata make -j6 PYTHON=python3 check
 
 task:
-  name: debian (root)
+  name: debian (long py3)
   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 .
+    su -l bup -c "eatmydata make -j6 -C '$(pwd)' PYTHON=python3 long-check"
 
 task:
-  name: debian (xattr)
+  name: debian (root py3)
   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"
+    su -l bup -c "eatmydata make -j6 -C '$(pwd)' PYTHON=python3 check"
 
 task:
-  name: freebsd
+  name: freebsd (py2)
   freebsd_instance:
-    image: freebsd-11-2-release-amd64
-    cpu: 2
-    memory: 8
+    image: freebsd-12-1-release-amd64
+    cpu: 4
+    memory: 4
   script: |
     set -xe
-    dev/prep-for-freebsd-build
+    dev/prep-for-freebsd-build python2
     dev/system-info
-    gmake -j3 check
+    gmake -j6 PYTHON=python2 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"
 
 task:
-  name: macos
+  name: freebsd (py3)
+  freebsd_instance:
+    image: freebsd-12-1-release-amd64
+    cpu: 4
+    memory: 4
+  script: |
+    set -xe
+    dev/prep-for-freebsd-build python3
+    dev/system-info
+    gmake -j6 PYTHON=python3.7 check
+
+task:
+  name: macos (py2)
+  allow_failures: true
   osx_instance:
-    image: mojave-xcode-10.2
+    image: catalina-base
   script: |
     set -xe
-    dev/prep-for-macos-build
+    dev/prep-for-macos-build python2
+    export PKG_CONFIG_PATH=/usr/local/opt/readline/lib/pkgconfig
     dev/system-info
-    make -j3 check
+    make -j4 PYTHON=python2 check
 
 task:
-  name: debian (python 3 - under construction)
-  container:
-    image: debian:buster
-    cpu: 2
-    memory: 8
+  name: macos (py3)
+  osx_instance:
+    image: catalina-base
   script: |
     set -xe
-    dev/prep-for-debianish-build python3
+    dev/prep-for-macos-build python3
+    export PKG_CONFIG_PATH=/usr/local/opt/readline/lib/pkgconfig
+    export PYTHON=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 -j4 PYTHON=python3 check