Skip to content

Commit 7eebcb3

Browse files
authored
MONGOCRYPT-866 publish debian13 "trixie" packages (#1100)
1 parent 315a5f6 commit 7eebcb3

File tree

4 files changed

+46
-4
lines changed

4 files changed

+46
-4
lines changed

.evergreen/config.yml

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ tasks:
463463
- func: "fetch source"
464464
- func: "earthly"
465465
vars:
466-
args: +create-deb-packages-and-repos --env=${earthly_env} --packager_distro=${packager_distro} --packager_arch=${packager_arch}
466+
args: +create-deb-packages-and-repos --env=${earthly_env} --packager_distro=${packager_distro} --packager_arch=${packager_arch} --ninja_version=${ninja_version}
467467
- func: "upload packages and repos"
468468

469469
- name: publish-deb-packages-with-earthly
@@ -675,6 +675,8 @@ tasks:
675675
name: build-and-test-and-upload
676676
- variant: amazon2023-arm64
677677
name: build-and-test-and-upload
678+
- variant: debian13
679+
name: build-and-test-and-upload
678680
- variant: debian12
679681
name: build-and-test-and-upload
680682
- variant: debian11
@@ -752,6 +754,8 @@ tasks:
752754
vars: { variant_name: "amazon2023" }
753755
- func: "download tarball"
754756
vars: { variant_name: "amazon2023-arm64" }
757+
- func: "download tarball"
758+
vars: { variant_name: "debian13" }
755759
- func: "download tarball"
756760
vars: { variant_name: "debian12" }
757761
- func: "download tarball"
@@ -1294,6 +1298,18 @@ buildvariants:
12941298
- name: publish-packages
12951299
distros:
12961300
- ubuntu2004-small
1301+
- name: debian13
1302+
display_name: "Debian 13"
1303+
run_on: debian13-m6i-xlarge
1304+
expansions:
1305+
has_packages: true
1306+
packager_distro: debian13
1307+
packager_arch: x86_64
1308+
tasks:
1309+
- build-and-test-and-upload
1310+
- name: publish-packages
1311+
distros:
1312+
- ubuntu2004-small
12971313
- name: debian12
12981314
display_name: "Debian 12"
12991315
run_on: debian12-large
@@ -1682,6 +1698,22 @@ buildvariants:
16821698
# Use a distro suitable for running curator to publish .deb packages.
16831699
run_on: ubuntu2004-small
16841700

1701+
- name: debian13-arm64-earthly
1702+
display_name: "Debian 13 arm64 (via Earthly)"
1703+
expansions:
1704+
has_packages: true
1705+
packager_distro: debian13
1706+
packager_arch: arm64
1707+
earthly_env: deb13
1708+
ninja_version: 1.12.1
1709+
tasks:
1710+
- name: build-deb-packages-with-earthly
1711+
# Use an arm64 distro to match the intended target architecture of .deb packages.
1712+
run_on: ubuntu2204-arm64-small
1713+
- name: publish-deb-packages-with-earthly
1714+
# Use a distro suitable for running curator to publish .deb packages.
1715+
run_on: ubuntu2004-small
1716+
16851717
- name: debian12-arm64-earthly
16861718
display_name: "Debian 12 arm64 (via Earthly)"
16871719
expansions:

Earthfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
# • deb10 - Debian 10.0
4848
# • deb11 - Debian 11.0
4949
# • deb12 - Debian 12.0
50+
# • deb13 - Debian 13
5051
# • sles15 - OpenSUSE Leap 15.0
5152
# • alpine - Alpine Linux 3.18
5253
#
@@ -214,6 +215,10 @@ env.deb12:
214215
# A Debian 12.0 environment
215216
DO +ENV_DEBIAN --version 12.0
216217

218+
env.deb13:
219+
# A Debian 13 environment
220+
DO +ENV_DEBIAN --version 13.0
221+
217222
env.sles15:
218223
# An OpenSUSE Leap 15.0 environment.
219224
FROM +init --base=opensuse/leap:15.0
@@ -235,6 +240,8 @@ CACHE_WARMUP:
235240
.evergreen/ensure-ninja.sh \
236241
/T/
237242
RUN bash /T/ensure-cmake.sh
243+
ARG ninja_version
244+
ENV NINJA_VERSION=$ninja_version
238245
RUN env NINJA_EXE=/usr/local/bin/ninja \
239246
bash /T/ensure-ninja.sh
240247

@@ -415,7 +422,8 @@ build:
415422
create-deb-packages-and-repos:
416423
ARG env
417424
FROM +env.$env
418-
DO +CACHE_WARMUP
425+
ARG ninja_version
426+
DO +CACHE_WARMUP --ninja_version=$ninja_version
419427
DO +COPY_SOURCE
420428
WORKDIR /s
421429
RUN __install dh-make dpkg-dev apt-utils

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ Second, create a list entry for the repository. For Ubuntu systems (be sure to
150150
echo "deb https://libmongocrypt.s3.amazonaws.com/apt/ubuntu <release>/libmongocrypt/1.17 universe" | sudo tee /etc/apt/sources.list.d/libmongocrypt.list
151151
```
152152

153-
For Debian systems (be sure to change `<release>` to `stretch`, `buster`, `bullseye`, or `bookworm` as appropriate to your system):
153+
For Debian systems (be sure to change `<release>` to `stretch`, `buster`, `bullseye`, `bookworm`, or `trixie` as appropriate to your system):
154154

155155
```
156156
echo "deb https://libmongocrypt.s3.amazonaws.com/apt/debian <release>/libmongocrypt/1.17 main" | sudo tee /etc/apt/sources.list.d/libmongocrypt.list

etc/packager.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,8 @@ def repo_os_version(self, build_os):
342342
return 'bullseye'
343343
elif build_os == 'debian12':
344344
return 'bookworm'
345+
elif build_os == 'debian13':
346+
return 'trixie'
345347
else:
346348
raise Exception("unsupported build_os: %s" % build_os)
347349
else:
@@ -395,7 +397,7 @@ def build_os(self, arch):
395397
"ubuntu2404",
396398
]
397399
elif self.dname == 'debian':
398-
return ["debian81", "debian92", "debian10", "debian11", "debian12"]
400+
return ["debian81", "debian92", "debian10", "debian11", "debian12", "debian13"]
399401
else:
400402
raise Exception("BUG: unsupported platform?")
401403

0 commit comments

Comments
 (0)