From eb9f1bbad65c7f2bc102ee1d4012b461e5bb246b Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 18 Sep 2021 12:48:43 -0400
Subject: Simplify CI configuration

---
 .gitlab-ci.yml | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b517694..9af7b6b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,20 +1,10 @@
-stages:
-  - build
-  - deploy
-
-.build_template: &build_definition
-  stage: build
-
-
 arm32_dbg:
-  <<: *build_definition
   image: lv2plugin/debian-arm32
   script:
     - meson . build --cross-file=/usr/share/meson/cross/arm-linux-gnueabihf.ini -Dbuildtype=debug -Dstrict=true -Dwerror=true
     - ninja -C build test
 
 arm32_rel:
-  <<: *build_definition
   image: lv2plugin/debian-arm32
   script:
     - meson . build --cross-file=/usr/share/meson/cross/arm-linux-gnueabihf.ini -Dbuildtype=release -Dstrict=true -Dwerror=true
@@ -22,14 +12,12 @@ arm32_rel:
 
 
 arm64_dbg:
-  <<: *build_definition
   image: lv2plugin/debian-arm64
   script:
     - meson . build --cross-file=/usr/share/meson/cross/aarch64-linux-gnu.ini -Dbuildtype=debug -Dstrict=true -Dwerror=true
     - ninja -C build test
 
 arm64_rel:
-  <<: *build_definition
   image: lv2plugin/debian-arm64
   script:
     - meson . build --cross-file=/usr/share/meson/cross/aarch64-linux-gnu.ini -Dbuildtype=release -Dstrict=true -Dwerror=true
@@ -37,7 +25,6 @@ arm64_rel:
 
 
 x64_dbg:
-  <<: *build_definition
   image: lv2plugin/debian-x64
   script:
     - meson . build -Dbuildtype=debug -Dstrict=true -Dwerror=true -Db_coverage=true
@@ -48,7 +35,6 @@ x64_dbg:
       - build/meson-logs/coveragereport
 
 x64_rel:
-  <<: *build_definition
   image: lv2plugin/debian-x64
   script:
     - meson . build -Dbuildtype=release -Dstrict=true -Dwerror=true
@@ -56,7 +42,6 @@ x64_rel:
 
 
 x64_static:
-  <<: *build_definition
   image: lv2plugin/debian-x64
   script:
     - meson . build -Ddefault_library=static -Dstrict=true -Dwerror=true
@@ -64,7 +49,6 @@ x64_static:
 
 
 x64_sanitize:
-  <<: *build_definition
   image: lv2plugin/debian-x64-clang
   script:
     - meson . build -Db_lundef=false -Dbuildtype=plain -Dstrict=true -Dwerror=true
@@ -76,14 +60,12 @@ x64_sanitize:
 
 
 freebsd_dbg:
-  <<: *build_definition
   tags: [freebsd,meson]
   script:
     - meson . build -Dbuildtype=debug -Dstrict=true -Dwerror=true
     - ninja -C build test
 
 freebsd_rel:
-  <<: *build_definition
   tags: [freebsd,meson]
   script:
     - meson . build -Dbuildtype=release -Dstrict=true -Dwerror=true
@@ -91,14 +73,12 @@ freebsd_rel:
 
 
 mingw32_dbg:
-  <<: *build_definition
   image: lv2plugin/debian-mingw32
   script:
     - meson . build --cross-file=/usr/share/meson/cross/i686-w64-mingw32.ini -Dbuildtype=debug -Dstrict=true -Dwerror=true
     - ninja -C build test
 
 mingw32_rel:
-  <<: *build_definition
   image: lv2plugin/debian-mingw32
   script:
     - meson . build --cross-file=/usr/share/meson/cross/i686-w64-mingw32.ini -Dbuildtype=release -Dstrict=true -Dwerror=true
@@ -106,14 +86,12 @@ mingw32_rel:
 
 
 mingw64_dbg:
-  <<: *build_definition
   image: lv2plugin/debian-mingw64
   script:
     - meson . build --cross-file=/usr/share/meson/cross/x86_64-w64-mingw32.ini -Dbuildtype=debug -Dstrict=true -Dwerror=true
     - ninja -C build test
 
 mingw64_rel:
-  <<: *build_definition
   image: lv2plugin/debian-mingw64
   script:
     - meson . build --cross-file=/usr/share/meson/cross/x86_64-w64-mingw32.ini -Dbuildtype=release -Dstrict=true -Dwerror=true
@@ -121,14 +99,12 @@ mingw64_rel:
 
 
 mac_dbg:
-  <<: *build_definition
   tags: [macos]
   script:
     - meson . build -Dbuildtype=debug -Dstrict=true -Dwerror=true
     - ninja -C build test
 
 mac_rel:
-  <<: *build_definition
   tags: [macos]
   script:
     - meson . build -Dbuildtype=release -Dstrict=true -Dwerror=true
@@ -136,14 +112,12 @@ mac_rel:
 
 
 win_dbg:
-  <<: *build_definition
   tags: [windows,meson]
   script:
     - meson . build -Dbuildtype=debug -Dstrict=true -Dwerror=true
     - ninja -C build test
 
 win_rel:
-  <<: *build_definition
   tags: [windows,meson]
   script:
     - meson . build -Dbuildtype=release -Dstrict=true -Dwerror=true
@@ -151,12 +125,11 @@ win_rel:
 
 
 pages:
-  stage: deploy
   script:
     - mkdir -p .public
     - mv build/meson-logs/coveragereport/ .public/coverage
     - mv .public public
-  dependencies:
+  needs:
     - x64_dbg
   artifacts:
     paths:
-- 
cgit v1.2.1