diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2021-03-01 22:30:05 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2021-03-01 22:30:05 +0100 |
| commit | 3a7aecd232dfdbcec5dbdc3af16e03479d47d917 (patch) | |
| tree | 7b69be67fad6151f3e0d63b63e9c2fdf7e93fcee | |
| parent | 757304ce49f7b9335132be53e8162cce89e85033 (diff) | |
Revert "Branch of as 2.2.y for bullseye"
This reverts commit d96c9a0280bffcfb0f4a319e003e9af60c6cfaf1.
It is not correct for master.
| -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 c8de2aba6..de517c11e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: debian:bullseye +image: debian:unstable 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:bullseye + image: i386/debian:unstable 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 6c85f91b1..a5e885896 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 = 2.2.y +debian-branch = master debian-tag = %(version)s export-dir = ../build-area sign-tags = True |