diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2021-02-23 20:27:32 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2021-02-23 21:58:45 +0100 |
| commit | d96c9a0280bffcfb0f4a319e003e9af60c6cfaf1 (patch) | |
| tree | 43d2f33316f296891ea141fbebe1f3600b812a02 | |
| parent | f8ff3afcd42d8b2e6506bc6f44a894149bf87442 (diff) | |
Branch of as 2.2.y for bullseye
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | debian/gbp.conf | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de517c11e..c8de2aba6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: debian:unstable +image: debian:bullseye variables: DEBIAN_FRONTEND: noninteractive CCACHE_DIR: $CI_PROJECT_DIR/.ccache @@ -23,7 +23,7 @@ test as root: - unbuffer ./test/integration/run-tests -q -j 4 test as user: - image: i386/debian:unstable + image: i386/debian:bullseye stage: test script: - adduser --home /home/travis travis --quiet --disabled-login --gecos "" --uid 1000 diff --git a/debian/gbp.conf b/debian/gbp.conf index a5e885896..6c85f91b1 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -3,7 +3,7 @@ ;preexport = ./prepare-release pre-export prebuild = ./prepare-release pre-build postbuild = ./prepare-release post-build -debian-branch = master +debian-branch = 2.2.y debian-tag = %(version)s export-dir = ../build-area sign-tags = True |