Update CI configuration for bullseye

1 files changed, 12 insertions, 76 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d6014f1..ea14a6b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-stages: [build, test, deploy]
+stages: [build, deploy]
 
 variables:
   GIT_SUBMODULE_STRATEGY: normal
@@ -17,139 +17,75 @@ variables:
 arm32_dbg:
   <<: *build_definition
   image: lv2plugin/debian-arm32
-  script: python ./waf configure build -dST --werror
+  script: python3 ./waf configure build test -dST --werror --wrapper=qemu-arm-static
   variables:
     CC: "arm-linux-gnueabihf-gcc"
     CXX: "arm-linux-gnueabihf-g++"
 
-test:arm32_dbg:
-  <<: *test_definition
-  image: lv2plugin/debian-arm32
-  script: python ./waf test --wrapper=qemu-arm
-  needs: [arm32_dbg]
-
-
 arm32_rel:
   <<: *build_definition
   image: lv2plugin/debian-arm32
-  script: python ./waf configure build -ST --werror
+  script: python3 ./waf configure build test -ST --werror --wrapper=qemu-arm-static
   variables:
     CC: "arm-linux-gnueabihf-gcc"
     CXX: "arm-linux-gnueabihf-g++"
 
-test:arm32_rel:
-  <<: *test_definition
-  image: lv2plugin/debian-arm32
-  script: python ./waf test --wrapper=qemu-arm
-  needs: [arm32_rel]
-
 
 arm64_dbg:
   <<: *build_definition
   image: lv2plugin/debian-arm64
-  script: python ./waf configure build -dST --werror
+  script: python3 ./waf configure build test -dST --werror --wrapper=qemu-aarch64-static
   variables:
     CC: "aarch64-linux-gnu-gcc"
     CXX: "aarch64-linux-gnu-g++"
 
-test:arm64_dbg:
-  <<: *test_definition
-  image: lv2plugin/debian-arm64
-  script: python ./waf test --wrapper=qemu-aarch64
-  needs: [arm64_dbg]
-
-
 arm64_rel:
   <<: *build_definition
   image: lv2plugin/debian-arm64
-  script: python ./waf configure build -ST --werror
+  script: python3 ./waf configure build test -ST --werror --wrapper=qemu-aarch64-static
   variables:
     CC: "aarch64-linux-gnu-gcc"
     CXX: "aarch64-linux-gnu-g++"
 
-test:arm64_rel:
-  <<: *test_definition
-  image: lv2plugin/debian-arm64
-  script: python ./waf test --wrapper=qemu-aarch64
-  needs: [arm64_rel]
-
 
 x64_dbg:
   <<: *build_definition
   image: lv2plugin/debian-x64
-  script: python ./waf configure build -dST --werror
-
-test:x64_dbg:
-  <<: *test_definition
-  image: lv2plugin/debian-x64
-  script: python ./waf test
-  needs: [x64_dbg]
-
+  script: python3 ./waf configure build test -dST --werror
 
 x64_rel:
   <<: *build_definition
   image: lv2plugin/debian-x64
-  script: python ./waf configure build -ST --werror
-
-test:x64_rel:
-  <<: *test_definition
-  image: lv2plugin/debian-x64
-  script: python ./waf test
-  needs: [x64_rel]
+  script: python3 ./waf configure build test -ST --werror
 
 
 mac_dbg:
   <<: *build_definition
-  script: python ./waf configure build -dST --werror --no-coverage
+  script: python3 ./waf configure build test -dST --werror --no-coverage
   tags: [macos]
 
-test:mac_dbg:
-  <<: *test_definition
-  script: python ./waf test
-  needs: [mac_dbg]
-  tags: [macos]
-
-
 mac_rel:
   <<: *build_definition
-  script: python ./waf configure build -ST --werror --no-coverage
-  tags: [macos]
-
-test:mac_rel:
-  <<: *test_definition
-  script: python ./waf test
-  needs: [mac_rel]
+  script: python3 ./waf configure build test -ST --werror --no-coverage
   tags: [macos]
 
 
 win_dbg:
   <<: *build_definition
-  script: python ./waf configure build -dST --werror --no-coverage
-  tags: [windows,msvc,python]
-
-test:win_dbg:
-  <<: *test_definition
-  script: python ./waf test
-  needs: [win_dbg]
+  script: python ./waf configure build test -dST --werror --no-coverage
   tags: [windows,msvc,python]
 
 
 win_rel:
   <<: *build_definition
-  script: python ./waf configure build -ST --werror --no-coverage
-  tags: [windows,msvc,python]
-
-test:win_rel:
-  <<: *test_definition
-  script: python ./waf test
-  needs: [win_rel]
+  script: python ./waf configure build test -ST --werror --no-coverage
   tags: [windows,msvc,python]
 
 
 pages:
   stage: deploy
   script: mv build/coverage/ public/
-  dependencies: ["test:x64_dbg"]
+  dependencies: ["x64_dbg"]
   artifacts:
     paths: [public]
   only: