From b503533a54113f22ea541958e9e1b7bfefe5fbc6 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 28 May 2019 13:55:12 -0400
Subject: [PATCH] [pkg] commit the debian and helpers folder
. tag whitewhale for debugging
. add a gbp.conf
. > is deprecated, need to use either >> or >=
---
.gitlab-ci.yml | 30 ++++++++++++++++++++++++------
debian/control | 2 +-
debian/gbp.conf | 6 ++++++
3 files changed, 31 insertions(+), 7 deletions(-)
create mode 100644 debian/gbp.conf
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58e1477..f5b7195 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,8 @@ stages:
.job_template: &job_definition
stage: publish
+ tags:
+ - whitewhale
# Only build packages for https://0xacab.org/leap/bitmask-dev, not
# for forks
image: "0xacab.org:4567/leap/gitlab-buildpackage:build_${DIST}_${ARCH}"
@@ -14,12 +16,14 @@ stages:
- "pwd; git describe"
- git checkout incoming
- git checkout origin/master debian/ helpers/
- #- build-build-package
+ - git add debian/* helpers/*
+ - git commit -m 'autocommit for debian folder'
+ - build-build-package
# Test the package with lintian
- #- build-test-lintian
- #- upload-package
+ - build-test-lintian
+ - upload-package
# sleep 1h to allow debugging of running container
- - sleep 9999
+ #- sleep 9999
artifacts:
expire_in: 1w
paths:
@@ -29,10 +33,24 @@ stages:
- '*.deb'
- 'results/*'
-package:amd64_stretch:
+#package:amd64_stretch:
+# variables:
+# ARCH: "amd64"
+# DIST: "stretch"
+# REPONAMES: "client"
+# # need these because there are some go packages not in stretch
+# # unfortunately, they aren't in stretch-backports either
+# - echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/backports.list
+# - echo 'deb-src http://deb.debian.org/debian stretch main' > /etc/apt/sources.list.d/sources.list
+# # Default is to fail on warnings, we disable it here
+# # unless all lintian warnings are fixed (#9033)
+# LINTIAN_OPTS: "-X filename-length, --suppress-tags newer-standards-version"
+# <<: *job_definition
+
+package:amd64_buster:
variables:
ARCH: "amd64"
- DIST: "stretch"
+ DIST: "buster"
REPONAMES: "client"
# Default is to fail on warnings, we disable it here
# unless all lintian warnings are fixed (#9033)
diff --git a/debian/control b/debian/control
index 5341fa0..95fb5f5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: riseup-vpn
Section: net
Priority: extra
Maintainer: LEAP Encryption Access Project <debian@leap.se>
-Build-Depends: debhelper (>= 10.0.0), dh-golang, golang-go (> 2:1.9),
+Build-Depends: debhelper (>= 10.0.0), dh-golang, golang-go (>> 2:1.9),
golang-golang-x-text-dev (>= 0.3.0-2),
libgtk-3-dev, libappindicator3-dev, pkg-config
Standards-Version: 3.9.8
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..0663435
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,6 @@
+[import-orig]
+pristine-tar=False
+
+[buildpackage]
+upstream-tree=SLOPPY
+debian-branch=incoming
--
GitLab