Skip to content

Commit 2efde1b

Browse files
authored
Use tag debian/1.30.4-1 for building Debian packages in Evergreen (#2078)
1 parent 85d89f5 commit 2efde1b

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

.evergreen/scripts/debian_package_build.sh

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,20 @@ trap on_exit EXIT
2323
git config user.email "[email protected]"
2424
git config user.name "Evergreen Build"
2525

26+
# Note that here, on the r1.30 branch, the tag debian/1.30.4-1 is used rather
27+
# than the branch debian/unstable. This is because the branch has advanced and
28+
# now contains updated packaging for the 2.x releases.
29+
2630
if [ "${IS_PATCH}" = "true" ]; then
2731
git diff HEAD > ../upstream.patch
2832
git clean -fdx
2933
git reset --hard HEAD
3034
git remote add upstream https://github.com/mongodb/mongo-c-driver
3135
git fetch upstream
3236
CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
33-
git checkout upstream/debian/unstable
37+
git checkout debian/1.30.4-1
3438
git checkout ${CURRENT_BRANCH}
35-
git checkout upstream/debian/unstable -- ./debian/
39+
git checkout debian/1.30.4-1 -- ./debian/
3640
if [ -s ../upstream.patch ]; then
3741
[ -d debian/patches ] || mkdir debian/patches
3842
mv ../upstream.patch debian/patches/
@@ -59,9 +63,9 @@ sudo chroot ./unstable-chroot /bin/bash -c '(\
5963
git remote add upstream https://github.com/mongodb/mongo-c-driver && \
6064
git fetch upstream && \
6165
export CURRENT_BRANCH="$(git rev-parse --abbrev-ref HEAD)" && \
62-
git checkout upstream/debian/unstable && \
66+
git checkout debian/1.30.4-1 && \
6367
git checkout ${CURRENT_BRANCH} && \
64-
git checkout upstream/debian/unstable -- ./debian/ && \
68+
git checkout debian/1.30.4-1 -- ./debian/ && \
6569
git commit -m "fetch debian directory from the debian/unstable branch" && \
6670
LANG=C /bin/bash ./debian/build_snapshot.sh && \
6771
debc ../*.changes && \
@@ -91,9 +95,9 @@ sudo chroot ./unstable-i386-chroot /bin/bash -c '(\
9195
git remote add upstream https://github.com/mongodb/mongo-c-driver && \
9296
git fetch upstream && \
9397
export CURRENT_BRANCH="$(git rev-parse --abbrev-ref HEAD)" && \
94-
git checkout upstream/debian/unstable && \
98+
git checkout debian/1.30.4-1 && \
9599
git checkout ${CURRENT_BRANCH} && \
96-
git checkout upstream/debian/unstable -- ./debian/ && \
100+
git checkout debian/1.30.4-1 -- ./debian/ && \
97101
git commit -m "fetch debian directory from the debian/unstable branch" && \
98102
LANG=C /bin/bash ./debian/build_snapshot.sh && \
99103
debc ../*.changes && \

0 commit comments

Comments
 (0)