From 6770ba83340b51e55e24aca64ae7a54297ef7838 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Wed, 20 Mar 2019 07:35:46 +0000
Subject: [PATCH] Switch to standard CI workflow

---
 .gitlab-ci.yml | 38 +-------------------------------------
 debian/control |  2 +-
 debian/rules   |  6 +++---
 3 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f1f481ba..f9d46324 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,37 +1 @@
-
-stages:
-  - build_src
-  - build_pkg
-  - upload
-
-build:src:
-  stage: build_src
-  image: "ai/build:stretch"
-  script: "build-dsc"
-  artifacts:
-    paths:
-      - build-deb/
-  only:
-    - master
-
-build:pkg:
-  stage: build_pkg
-  image: "ai/build:stretch"
-  script: "build-deb"
-  dependencies:
-    - build:src
-  artifacts:
-    paths:
-      - output-deb/
-  only:
-    - master
-
-upload:pkg:
-  stage: upload
-  image: "ai/pkg:base"
-  script: "upload-packages -r ai3"
-  dependencies:
-    - build:pkg
-  only:
-    - master
-
+include: "https://git.autistici.org/ai3/build-deb/raw/master/ci-common.yml"
diff --git a/debian/control b/debian/control
index 22160a54..00732e0a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: acmeserver
 Section: admin
 Priority: optional
 Maintainer: Autistici/Inventati <debian@autistici.org>
-Build-Depends: debhelper (>=9), golang-go, dh-systemd, dh-golang
+Build-Depends: debhelper (>=9), golang-any (>=1.11), dh-systemd, dh-golang
 Standards-Version: 3.9.6
 
 Package: acmeserver
diff --git a/debian/rules b/debian/rules
index f0ecee87..27dc78b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,9 @@ export DH_GOLANG_EXCLUDES = vendor
 %:
 	dh $@ --with systemd --with golang --buildsystem golang
 
-override_dh_install:
-	rm -fr $(CURDIR)/debian/acmeserver/usr/share/gocode
-	dh_install
+override_dh_auto_install:
+	dh_auto_install
+	$(RM) -rv debian/acmeserver/usr/share/gocode
 
 override_dh_systemd_enable:
 	dh_systemd_enable --no-enable
-- 
GitLab