X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.cirrus.yml;h=c7bdd82db3653662e6e9e6ac52dbe6377a1f2c4d;hb=a995eea8bd57041cb373f7041da373897a2ed597;hp=0c6ee6690199c85f29d064d6b94350938d47d0c9;hpb=3bfb67dcf331370ea2b205fa4f1cadacdce29af2;p=bup.git

diff --git a/.cirrus.yml b/.cirrus.yml
index 0c6ee66..c7bdd82 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,46 +1,6 @@
 
 task:
-  name: debian (py2)
-  container:
-    image: debian:buster
-    cpu: 4
-    memory: 2
-  script: |
-    set -xe
-    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 -j6 -C '$(pwd)' PYTHON=python2 check"
-
-task:
-  name: debian (py3)
+  name: debian check/lint root
   container:
     image: debian:buster
     cpu: 4
@@ -49,10 +9,11 @@ task:
     set -xe
     dev/prep-for-debianish-build python3
     dev/system-info
-    eatmydata make -j6 PYTHON=python3 check
+    BUP_PYTHON_CONFIG=python3-config ./configure --with-pylint=yes
+    make -j6 check
 
 task:
-  name: debian (long py3)
+  name: debian long-check
   container:
     image: debian:buster
     cpu: 4
@@ -63,10 +24,11 @@ task:
     dev/system-info
     adduser --disabled-password --gecos '' bup
     chown -R bup:bup .
-    su -l bup -c "eatmydata make -j6 -C '$(pwd)' PYTHON=python3 long-check"
+    printf "make -j6 -C %q BUP_PYTHON_CONFIG=python3-config long-check" \
+      "$(pwd)" | su -l bup
 
 task:
-  name: debian (root py3)
+  name: debian check
   container:
     image: debian:buster
     cpu: 4
@@ -77,55 +39,28 @@ task:
     dev/system-info
     adduser --disabled-password --gecos '' bup
     chown -R bup:bup .
-    su -l bup -c "eatmydata make -j6 -C '$(pwd)' PYTHON=python3 check"
+    printf "make -j6 -C %q BUP_PYTHON_CONFIG=python3-config check" \
+      "$(pwd)" | su -l bup
 
 task:
-  name: freebsd (py2)
+  name: freebsd check
   freebsd_instance:
-    image: freebsd-12-1-release-amd64
-    cpu: 4
-    memory: 4
-  script: |
-    set -xe
-    dev/prep-for-freebsd-build python2
-    dev/system-info
-    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: freebsd (py3)
-  freebsd_instance:
-    image: freebsd-12-1-release-amd64
+    image: freebsd-12-2-release-amd64
     cpu: 4
     memory: 4
   script: |
     set -xe
     dev/prep-for-freebsd-build python3
     dev/system-info
-    gmake -j6 PYTHON=python3 check
-
-task:
-  name: macos (py2)
-  osx_instance:
-    image: catalina-base
-  script: |
-    set -xe
-    dev/prep-for-macos-build python2
-    export PKG_CONFIG_PATH=/usr/local/opt/readline/lib/pkgconfig
-    dev/system-info
-    make -j4 PYTHON=python2 check
+    BUP_PYTHON_CONFIG=python3.8-config make -j6 check
 
 task:
-  name: macos (py3)
+  name: macos 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
-    export PYTHON=python3
     dev/system-info
-    make -j4 PYTHON=python3 check
+    make -j6 BUP_PYTHON_CONFIG=python3-config LDFLAGS=-L/usr/local/lib check