From db5a1b384dd6059f4298fc03fc1bcb82bfe9c973 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 12 May 2022 16:28:19 +0200 Subject: [PATCH 1/2] Revert "fix(build): temporarily remove debian11 publishing (#1283)" This reverts commit 4e88ce238c93af5f2eb5ad9f9e3a2ac5ef1eb2e0. --- packages/build/src/barque.spec.ts | 4 ++-- packages/build/src/barque.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/build/src/barque.spec.ts b/packages/build/src/barque.spec.ts index 3fe64567ee..0ac550d1e1 100644 --- a/packages/build/src/barque.spec.ts +++ b/packages/build/src/barque.spec.ts @@ -51,12 +51,12 @@ describe('Barque', () => { 'https://repo.mongodb.com/apt/debian/dists/stretch/mongodb-enterprise/5.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.org/apt/debian/dists/stretch/mongodb-org/6.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.com/apt/debian/dists/stretch/mongodb-enterprise/6.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', - /* 'https://repo.mongodb.org/apt/debian/dists/bullseye/mongodb-org/4.4/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', + 'https://repo.mongodb.org/apt/debian/dists/bullseye/mongodb-org/4.4/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.com/apt/debian/dists/bullseye/mongodb-enterprise/4.4/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.org/apt/debian/dists/bullseye/mongodb-org/5.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.com/apt/debian/dists/bullseye/mongodb-enterprise/5.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.org/apt/debian/dists/bullseye/mongodb-org/6.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', - 'https://repo.mongodb.com/apt/debian/dists/bullseye/mongodb-enterprise/6.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb'*/ + 'https://repo.mongodb.com/apt/debian/dists/bullseye/mongodb-enterprise/6.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb' ] }, { diff --git a/packages/build/src/barque.ts b/packages/build/src/barque.ts index 94142d98d1..78890c4402 100644 --- a/packages/build/src/barque.ts +++ b/packages/build/src/barque.ts @@ -42,7 +42,7 @@ export function getReposAndArch(buildVariant: BuildVariant): { ppas: PPAReposito return { ppas: [], arch: '' }; case 'debian': return { - ppas: ['ubuntu1804', 'ubuntu2004', 'debian92', 'debian10'/* , 'debian11'*/], + ppas: ['ubuntu1804', 'ubuntu2004', 'debian92', 'debian10', 'debian11'], arch: getDebArchName(getArch(buildVariant)) }; case 'rhel7': From 557a4d63fb7a2f3ee85234c5d2bfe2f9ee1eb2b0 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 12 May 2022 16:29:57 +0200 Subject: [PATCH 2/2] fix: add debian11 community to repo-config.yml --- config/repo-config.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/config/repo-config.yml b/config/repo-config.yml index 858a3b4c89..5268de1f6f 100644 --- a/config/repo-config.yml +++ b/config/repo-config.yml @@ -66,6 +66,7 @@ repos: component: main architectures: - amd64 + - arm64 repos: - apt/debian/dists/stretch/mongodb-org @@ -77,9 +78,22 @@ repos: component: main architectures: - amd64 + - arm64 repos: - apt/debian/dists/buster/mongodb-org + - name: debian11 + type: deb + code_name: "bullseye" + bucket: repo.mongodb.org + edition: org + component: main + architectures: + - amd64 + - arm64 + repos: + - apt/debian/dists/bullseye/mongodb-org + - name: ubuntu1804 type: deb code_name: "bionic"