Skip to content

Commit 5a33cd5

Browse files
authored
Add archive repo to fix Debian 10 task (#1038)
* fix Debian 10 Earthly tasks * copy debian directory in Earthly environment
1 parent 5b4691b commit 5a33cd5

2 files changed

Lines changed: 7 additions & 9 deletions

File tree

.evergreen/earthly.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@ set -euo pipefail
66

77
: "${EARTHLY_VERSION:=0.7.8}"
88

9-
# Bring in the debian/ directory from the debian/unstable branch
10-
pushd "$(dirname "${BASH_SOURCE[0]}")/../"
11-
(git remote | grep -q upstream) || git remote add upstream https://github.com/mongodb/libmongocrypt
12-
git fetch upstream
13-
git checkout $(git rev-parse upstream/debian/unstable) -- debian
14-
popd
15-
169
# Calc the arch of the executable we want
1710
arch="$(uname -m)"
1811
case "$arch" in

Earthfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,10 @@ ENV_DEBIAN:
189189
COPY +get-deb-signing-keys/keys/deb10-archive-signing-key.gpg /etc/apt/trusted.gpg.d
190190
COPY +get-deb-signing-keys/keys/deb11-archive-signing-key.gpg /etc/apt/trusted.gpg.d
191191
END
192+
IF [ $version = "10.0" ]
193+
# Update source list for archived Debian buster packages.
194+
RUN echo "deb http://archive.debian.org/debian buster main" > /etc/apt/sources.list
195+
END
192196
DO +DEBIAN_SETUP
193197

194198
env.deb9:
@@ -241,7 +245,6 @@ COPY_SOURCE:
241245
cmake/ \
242246
kms-message/ \
243247
test/ \
244-
debian/ \
245248
src/ \
246249
doc/ \
247250
etc/ \
@@ -316,13 +319,15 @@ deb-build:
316319
RUN __install git-buildpackage fakeroot debhelper cmake libbson-dev \
317320
libintelrdfpmath-dev
318321
DO +COPY_SOURCE
322+
# Bring in the debian/ directory from the debian/unstable branch
323+
GIT CLONE https://github.com/mongodb/libmongocrypt --branch debian/unstable libmongocrypt-debian
319324
WORKDIR /s/libmongocrypt
320325
RUN git clean -fdx && git reset --hard
321326
RUN python3 etc/calc_release_version.py > VERSION_CURRENT
322327
RUN git add -f VERSION_CURRENT && \
323328
git -c user.name=anon -c user.email=anon@localhost \
324329
commit VERSION_CURRENT -m 'Set version' && \
325-
env LANG=C bash debian/build_snapshot.sh && \
330+
env LANG=C bash libmongocrypt-debian/debian/build_snapshot.sh && \
326331
debc ../*.changes && \
327332
dpkg -i ../*.deb
328333
SAVE ARTIFACT /s/*.deb /debs/

0 commit comments

Comments
 (0)