[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/latest] 7 commits: salsa-ci: Set DEBEMAIL for gbp dch

[Guido Günther (@agx)]

Guido Günther pushed to branch debian/latest at Libvirt Packaging Team / libvirt


Commits:
ff4553ea by Andrea Bolognani at 2021-11-19T00:39:26+01:00
salsa-ci: Set DEBEMAIL for gbp dch

gbp 0.9.24 and newer require this.

Gbp-Dch: Ignore

- - - - -
078d0eb7 by Andrea Bolognani at 2021-11-19T00:39:26+01:00
salsa-ci: Fix typo in email address

Gbp-Dch: Ignore

- - - - -
908e65b5 by Andrea Bolognani at 2021-11-19T00:39:26+01:00
salsa-ci: Fix weird quoting

Gbp-Dch: Ignore

- - - - -
d69ae747 by Andrea Bolognani at 2021-11-19T00:39:26+01:00
salsa-ci: Reformat call to gbp dch

Replace -S with the more explicit --snapshot in the process.

Gbp-Dch: Ignore

- - - - -
8ecf447d by Andrea Bolognani at 2021-11-19T00:39:26+01:00
salsa-ci: Don't pass -a to gbp dch

According to the manual page, it's a legacy option that's
currently ignored.

Gbp-Dch: Ignore

- - - - -
e1f1c977 by Andrea Bolognani at 2021-11-19T00:39:26+01:00
salsa-ci: Commit changes made to Debian changelog

This makes things more straighforward, as we don't have
to manually add the changes to the git index or tell git
buildpackage to use the git index as source when exporting.

Gbp-Dch: Ignore

- - - - -
938db09c by Andrea Bolognani at 2021-11-19T00:39:26+01:00
salsa-ci: Drop unnecessary call to rm

None of the commands that we execute up to this point is
supposed to create any files in the parent directory.

Gbp-Dch: Ignore

- - - - -


1 changed file:

- debian/salsa-ci.yml


Changes:

=====================================
debian/salsa-ci.yml
=====================================
@@ -17,22 +17,23 @@ build-debian-package:
     - apt-get -y update
     - apt-get -y install build-essential git-buildpackage pristine-tar
     - apt-get -y build-dep .
-    - rm -f ../* || true
-    - git config user.email 'libvirt at exmple.com'
+    - git config user.email 'libvirt at example.com'
     - git config user.name 'Gitlab CI'
   script:
-    - 'UPSTREAM_BRANCH=$(gbp config dch.upstream-branch)'
+    - export DEBEMAIL="$(git config user.email)"
+    - UPSTREAM_BRANCH="$(gbp config dch.upstream-branch)"
     - git branch "${UPSTREAM_BRANCH}" "origin/${UPSTREAM_BRANCH}"
     - git branch pristine-tar origin/pristine-tar
-    - gbp dch --git-author -S -a --ignore-branch
+    - gbp dch --git-author
+              --snapshot
+              --commit
+              --ignore-branch
     - mkdir -p "${LV_WORKING_DIR}/tarballs"
     - gbp export-orig --tarball-dir="${LV_WORKING_DIR}/tarballs"
                       --pristine-tar
-    - git add debian/changelog
     - gbp buildpackage --git-ignore-new
                        --git-ignore-branch
                        --git-export-dir="${LV_WORKING_DIR}/"
-                       --git-export=INDEX
                        --git-tarball-dir="${LV_WORKING_DIR}/tarballs"
                         -j -b -uc -us > "${LV_WORKING_DIR}/build.log"
   artifacts:



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/1a2c65f16ac37a6fd6d72b906355bab6c7355c29...938db09cabcb6afaa01cfe28d63621063f7f04f8

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/1a2c65f16ac37a6fd6d72b906355bab6c7355c29...938db09cabcb6afaa01cfe28d63621063f7f04f8
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20211119/45df2a41/attachment-0001.htm>