From bdbf6f6feac527685296fe4181cfcb1a459a6248 Mon Sep 17 00:00:00 2001 From: Kevin Mas Ruiz Date: Wed, 23 Aug 2023 13:05:49 +0200 Subject: [PATCH 01/11] chore: group by platform correctly --- config/release-package-matrix.d.ts | 1 + config/release-package-matrix.js | 52 ++++++++-------- package-lock.json | 59 +++++++++---------- packages/build/package.json | 2 +- packages/build/src/config/build-variant.ts | 12 ++++ .../build/src/download-center/config.spec.ts | 54 ++++++++++------- packages/build/src/download-center/config.ts | 39 ++++++++---- 7 files changed, 128 insertions(+), 91 deletions(-) diff --git a/config/release-package-matrix.d.ts b/config/release-package-matrix.d.ts index f37e3c8ddc..ff0b827187 100644 --- a/config/release-package-matrix.d.ts +++ b/config/release-package-matrix.d.ts @@ -8,6 +8,7 @@ export interface PackageInformation { name: string; description: string; packageOn: string; + packageType: 'dmg' | 'tar.gz' | 'deb' | 'rpm' | 'zip' | 'msi'; smokeTestKind: 'docker' | 'rpmextract' | 'debextract' | 'none'; smokeTestDockerfiles?: string[]; serverLikeTargetList: string[]; diff --git a/config/release-package-matrix.js b/config/release-package-matrix.js index 0fa3419aa9..a357890713 100644 --- a/config/release-package-matrix.js +++ b/config/release-package-matrix.js @@ -13,92 +13,92 @@ exports.RELEASE_PACKAGE_MATRIX = [ executableOsId: 'darwin-x64', compileBuildVariant: 'darwin', packages: [ - { name: 'darwin-x64', description: 'MacOS 64-bit (10.14+)', packageOn: 'darwin', smokeTestKind: 'macos', serverLikeTargetList: ['macos'] } + { name: 'darwin-x64', description: 'MacOS 64-bit (10.14+)', packageType: 'zip', packageOn: 'darwin', smokeTestKind: 'macos', serverLikeTargetList: ['macos'] } ] }, { executableOsId: 'darwin-arm64', compileBuildVariant: 'darwin_arm64', packages: [ - { name: 'darwin-arm64', description: 'MacOS M1 (11.0+)', packageOn: 'darwin', smokeTestKind: 'macos', serverLikeTargetList: ['macos'] } + { name: 'darwin-arm64', description: 'MacOS M1 (11.0+)', packageType: 'zip', packageOn: 'darwin', smokeTestKind: 'macos', serverLikeTargetList: ['macos'] } ] }, { executableOsId: 'linux-x64', compileBuildVariant: 'linux_x64_build', packages: [ - { name: 'linux-x64', description: 'Linux Tarball 64-bit', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...allLinux] }, - { name: 'deb-x64', description: 'Debian / Ubuntu 64-bit', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'ubuntu22.04-nohome-deb', 'debian9-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-x64', description: 'RHEL / CentOS / Fedora / Suse 64-bit', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'suse12-rpm', 'suse15-rpm', 'amazonlinux1-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } + { name: 'linux-x64', description: 'Linux 64-bit', packageType: 'tar.gz', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...allLinux] }, + { name: 'deb-x64', description: 'Debian / Ubuntu 64-bit', packageType: 'deb', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'ubuntu22.04-nohome-deb', 'debian9-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-x64', description: 'RHEL / CentOS / Fedora / Suse 64-bit', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'suse12-rpm', 'suse15-rpm', 'amazonlinux1-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } ] }, { executableOsId: 'linux-x64-openssl11', compileBuildVariant: 'linux_x64_build_openssl11', packages: [ - { name: 'linux-x64-openssl11', description: 'Linux Tarball 64-bit (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, - { name: 'deb-x64-openssl11', description: 'Debian / Ubuntu 64-bit (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-x64-openssl11', description: 'RHEL / CentOS 64-bit (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-epel-rpm', 'amazonlinux2-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } + { name: 'linux-x64-openssl11', description: 'Linux 64-bit (shared OpenSSL 1.1)', packageType: 'tar.gz', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, + { name: 'deb-x64-openssl11', description: 'Debian / Ubuntu 64-bit (shared OpenSSL 1.1)', packageType: 'deb', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-x64-openssl11', description: 'RHEL / CentOS 64-bit (shared OpenSSL 1.1)', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-epel-rpm', 'amazonlinux2-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } ] }, { executableOsId: 'linux-x64-openssl3', compileBuildVariant: 'linux_x64_build_openssl3', packages: [ - { name: 'linux-x64-openssl3', description: 'Linux Tarball 64-bit (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, - { name: 'deb-x64-openssl3', description: 'Debian / Ubuntu 64-bit (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-x64-openssl3', description: 'RHEL / CentOS 64-bit (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } + { name: 'linux-x64-openssl3', description: 'Linux 64-bit (shared OpenSSL 3)', packageType: 'tar.gz', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, + { name: 'deb-x64-openssl3', description: 'Debian / Ubuntu 64-bit (shared OpenSSL 3)', packageType: 'deb', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-x64-openssl3', description: 'RHEL / CentOS 64-bit (shared OpenSSL 3)', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } ] }, { executableOsId: 'linux-arm64', compileBuildVariant: 'linux_arm64_build', packages: [ - { name: 'linux-arm64', description: 'Linux Tarball arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...al2AndAbove] }, - { name: 'deb-arm64', description: 'Debian / Ubuntu arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-arm64', description: 'RHEL / CentOS arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } + { name: 'linux-arm64', description: 'Linux arm64', packageType: 'tar.gz', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...al2AndAbove] }, + { name: 'deb-arm64', description: 'Debian / Ubuntu arm64', packageType: 'deb', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-arm64', description: 'RHEL / CentOS arm64', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } ] }, { executableOsId: 'linux-arm64-openssl11', compileBuildVariant: 'linux_arm64_build_openssl11', packages: [ - { name: 'linux-arm64-openssl11', description: 'Linux Tarball arm64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, - { name: 'deb-arm64-openssl11', description: 'Debian / Ubuntu arm64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-arm64-openssl11', description: 'Redhat / Centos arm64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm'], serverLikeTargetList: [...al2AndAbove] } + { name: 'linux-arm64-openssl11', description: 'Linux arm64 (shared OpenSSL 1.1)', packageType: 'tar.gz', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, + { name: 'deb-arm64-openssl11', description: 'Debian / Ubuntu arm64 (shared OpenSSL 1.1)', packageType: 'deb', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-arm64-openssl11', description: 'Redhat / Centos arm64 (shared OpenSSL 1.1)', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm'], serverLikeTargetList: [...al2AndAbove] } ] }, { executableOsId: 'linux-arm64-openssl3', compileBuildVariant: 'linux_arm64_build_openssl3', packages: [ - { name: 'linux-arm64-openssl3', description: 'Linux Tarball arm64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, - { name: 'deb-arm64-openssl3', description: 'Debian / Ubuntu arm64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-arm64-openssl3', description: 'RHEL / CentOS arm64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } + { name: 'linux-arm64-openssl3', description: 'Linux arm64 (shared OpenSSL 3)', packageType: 'tar.gz', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, + { name: 'deb-arm64-openssl3', description: 'Debian / Ubuntu arm64 (shared OpenSSL 3)', packageType: 'deb', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-arm64-openssl3', description: 'RHEL / CentOS arm64 (shared OpenSSL 3)', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } ] }, { executableOsId: 'linux-ppc64le', compileBuildVariant: 'linux_ppc64le_build', packages: [ - { name: 'linux-ppc64le', description: 'Linux Tarball ppc64le', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel81AndAbove] }, - { name: 'rpm-ppc64le', description: 'Redhat / Centos ppc64le', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel81AndAbove] } + { name: 'linux-ppc64le', description: 'Linux ppc64le', packageType: 'tar.gz', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel81AndAbove] }, + { name: 'rpm-ppc64le', description: 'Redhat / Centos ppc64le', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel81AndAbove] } ] }, { executableOsId: 'linux-s390x', compileBuildVariant: 'linux_s390x_build', packages: [ - { name: 'linux-s390x', description: 'Linux Tarball s390x', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel72AndAbove] }, - { name: 'rpm-s390x', description: 'Redhat / Centos s390x', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel72AndAbove] } + { name: 'linux-s390x', description: 'Linux s390x', packageType: 'tar.gz', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel72AndAbove] }, + { name: 'rpm-s390x', description: 'Redhat / Centos s390x', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel72AndAbove] } ] }, { executableOsId: 'win32', compileBuildVariant: 'win32_build', packages: [ - { name: 'win32-x64', description: 'Windows 64-bit (8.1+)', packageOn: 'win32', smokeTestKind: 'ssh', serverLikeTargetList: ['windows'] }, - { name: 'win32msi-x64', description: 'Windows 64-bit (8.1+) (MSI)', packageOn: 'win32', smokeTestKind: 'ssh', serverLikeTargetList: ['windows'] } + { name: 'win32-x64', description: 'Windows 64-bit (8.1+)', packageType: 'zip', packageOn: 'win32', smokeTestKind: 'ssh', serverLikeTargetList: ['windows'] }, + { name: 'win32msi-x64', description: 'Windows 64-bit (8.1+)', packageType: 'msi', packageOn: 'win32', smokeTestKind: 'ssh', serverLikeTargetList: ['windows'] } ] } ]; diff --git a/package-lock.json b/package-lock.json index c9a8a07f81..19c436b270 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9493,19 +9493,6 @@ "node": ">= 12" } }, - "node_modules/@mongodb-js/dl-center": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@mongodb-js/dl-center/-/dl-center-1.0.1.tgz", - "integrity": "sha512-gUxfbhvYWjWK+QHyrB2iiwkN/EZqab6tJG33A7rNR5lPC9rmzzBAKU62AuB4vFhaMtT3m9Vswbu2040IqMm0xw==", - "dependencies": { - "ajv": "^6.12.5", - "aws-sdk": "^2.770.0", - "node-fetch": "^2.6.1" - }, - "engines": { - "node": ">= 12" - } - }, "node_modules/@mongodb-js/eslint-config-devtools": { "version": "0.9.9", "resolved": "https://registry.npmjs.org/@mongodb-js/eslint-config-devtools/-/eslint-config-devtools-0.9.9.tgz", @@ -12853,9 +12840,9 @@ } }, "node_modules/aws-sdk": { - "version": "2.1354.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1354.0.tgz", - "integrity": "sha512-3aDxvyuOqMB9DqJguCq6p8momdsz0JR1axwkWOOCzHA7a35+Bw+WLmqt3pWwRjR1tGIwkkZ2CvGJObYHsOuw3w==", + "version": "2.1442.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1442.0.tgz", + "integrity": "sha512-Rp6kP813tdlg3R3Zi6Olt5NSutlx1UjhhoogJpEeIUQFXul7t/mu5FpyUZmYRsBN6TPCj9QD0eJOtBaFN4LZtg==", "dependencies": { "buffer": "4.9.2", "events": "1.1.1", @@ -30226,7 +30213,7 @@ "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-github-repo": "^1.0.1", - "@mongodb-js/dl-center": "^1.0.1", + "@mongodb-js/dl-center": "^0.2.0", "@mongodb-js/mongodb-downloader": "^0.2.7", "@octokit/rest": "^17.9.0", "aws-sdk": "^2.674.0", @@ -30267,6 +30254,16 @@ "node": ">=14.15.1" } }, + "packages/build/node_modules/@mongodb-js/dl-center": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@mongodb-js/dl-center/-/dl-center-0.2.0.tgz", + "integrity": "sha512-6JvTZcRJeJ66JrG4WUlX4+3or+/pV4UeaRVOU7c4uB/8zQxDIZiPUalfZiGuQjs7k6il69YDrSqslaATOdqrtQ==", + "dependencies": { + "ajv": "^6.12.5", + "aws-sdk": "^2.1441.0", + "node-fetch": "^2.6.7" + } + }, "packages/build/node_modules/yaml": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz", @@ -38964,16 +38961,6 @@ "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-github-repo/-/devtools-github-repo-1.2.0.tgz", "integrity": "sha512-rBwJHZ0g3Ma6zluNUWfeFXvuxsz9ZtFX2YZ1qR/aQEwk64ZhOqjrVbcROSdtfGUs4qg1JGXFIU+ZQ+oLYqPEvQ==" }, - "@mongodb-js/dl-center": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@mongodb-js/dl-center/-/dl-center-1.0.1.tgz", - "integrity": "sha512-gUxfbhvYWjWK+QHyrB2iiwkN/EZqab6tJG33A7rNR5lPC9rmzzBAKU62AuB4vFhaMtT3m9Vswbu2040IqMm0xw==", - "requires": { - "ajv": "^6.12.5", - "aws-sdk": "^2.770.0", - "node-fetch": "^2.6.1" - } - }, "@mongodb-js/eslint-config-devtools": { "version": "0.9.9", "resolved": "https://registry.npmjs.org/@mongodb-js/eslint-config-devtools/-/eslint-config-devtools-0.9.9.tgz", @@ -39494,7 +39481,7 @@ "version": "file:packages/build", "requires": { "@mongodb-js/devtools-github-repo": "^1.0.1", - "@mongodb-js/dl-center": "^1.0.1", + "@mongodb-js/dl-center": "^0.2.0", "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/mongodb-downloader": "^0.2.7", "@mongodb-js/prettier-config-devtools": "^1.0.1", @@ -39530,6 +39517,16 @@ "yaml": "^2.3.1" }, "dependencies": { + "@mongodb-js/dl-center": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@mongodb-js/dl-center/-/dl-center-0.2.0.tgz", + "integrity": "sha512-6JvTZcRJeJ66JrG4WUlX4+3or+/pV4UeaRVOU7c4uB/8zQxDIZiPUalfZiGuQjs7k6il69YDrSqslaATOdqrtQ==", + "requires": { + "ajv": "^6.12.5", + "aws-sdk": "^2.1441.0", + "node-fetch": "^2.6.7" + } + }, "yaml": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz", @@ -42471,9 +42468,9 @@ "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==" }, "aws-sdk": { - "version": "2.1354.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1354.0.tgz", - "integrity": "sha512-3aDxvyuOqMB9DqJguCq6p8momdsz0JR1axwkWOOCzHA7a35+Bw+WLmqt3pWwRjR1tGIwkkZ2CvGJObYHsOuw3w==", + "version": "2.1442.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1442.0.tgz", + "integrity": "sha512-Rp6kP813tdlg3R3Zi6Olt5NSutlx1UjhhoogJpEeIUQFXul7t/mu5FpyUZmYRsBN6TPCj9QD0eJOtBaFN4LZtg==", "requires": { "buffer": "4.9.2", "events": "1.1.1", diff --git a/packages/build/package.json b/packages/build/package.json index dd7ea48c0c..21395b22e6 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -59,7 +59,7 @@ "dependencies": { "@mongodb-js/devtools-github-repo": "^1.0.1", "@mongodb-js/mongodb-downloader": "^0.2.7", - "@mongodb-js/dl-center": "^1.0.1", + "@mongodb-js/dl-center": "^0.2.0", "@octokit/rest": "^17.9.0", "aws-sdk": "^2.674.0", "boxednode": "^2.0.1", diff --git a/packages/build/src/config/build-variant.ts b/packages/build/src/config/build-variant.ts index 2fba32bde5..e6964e6c94 100644 --- a/packages/build/src/config/build-variant.ts +++ b/packages/build/src/config/build-variant.ts @@ -114,3 +114,15 @@ export function getDownloadCenterDistroDescription( throw new Error(`${variant} is not a valid build variant`); } + +export function getDownloadCenterPackageType(variant: PackageVariant): string { + for (const { packages } of RELEASE_PACKAGE_MATRIX) { + for (const pkg of packages) { + if (pkg.name === variant) { + return pkg.packageType; + } + } + } + + throw new Error(`${variant} is not a valid build variant`); +} diff --git a/packages/build/src/download-center/config.spec.ts b/packages/build/src/download-center/config.spec.ts index 0daa70b0c8..4aea413e3d 100644 --- a/packages/build/src/download-center/config.spec.ts +++ b/packages/build/src/download-center/config.spec.ts @@ -1,4 +1,7 @@ -import type { DownloadCenterConfig } from '@mongodb-js/dl-center/dist/download-center-config'; +import type { + DownloadCenterConfig, + PlatformWithPackages, +} from '@mongodb-js/dl-center/dist/download-center-config'; import type { PackageInformationProvider } from '../packaging'; import { expect } from 'chai'; import sinon from 'sinon'; @@ -32,7 +35,7 @@ const packageInformation = (version: string) => }; }) as PackageInformationProvider; -describe('DownloadCenter config', function () { +describe.only('DownloadCenter config', function () { describe('createVersionConfig', function () { it('sets the version correctly', function () { const version = createVersionConfig(packageInformation('1.2.2')); @@ -40,25 +43,27 @@ describe('DownloadCenter config', function () { expect(version.version).to.equal('1.2.2'); }); - it('has an artifact for darwin', function () { + it('has an artifact for MacOS 64-bit (10.14+)', function () { const version = createVersionConfig(packageInformation('1.2.2')); - const platforms = version.platform.filter((p) => p.os === 'darwin'); - expect(platforms).to.have.length(2); - expect(platforms[0].download_link).to.include( + const platforms = version.platform.filter( + (p) => (p.os as string) === 'MacOS 64-bit (10.14+)' + ) as any as PlatformWithPackages[]; + expect(platforms).to.have.length(1); + expect(platforms[0].packages.links[0].name).to.include('zip'); + expect(platforms[0].packages.links[0].download_link).to.include( 'mongosh-1.2.2-darwin-x64.zip' ); - expect(platforms[1].download_link).to.include( - 'mongosh-1.2.2-darwin-arm64.zip' - ); }); it('has an artifact for linux', function () { const version = createVersionConfig(packageInformation('1.2.2')); const platforms = version.platform.filter( - (p) => p.os === 'linux' && p.arch === 'x64' + (p) => p.os.startsWith('Linux 64-bit') && p.arch === 'x64' ); expect(platforms).to.have.length(3); - expect(platforms.map((p) => p.download_link)).to.deep.equal([ + expect( + platforms.flatMap((p) => p.packages.links.map((l) => l.download_link)) + ).to.deep.equal([ 'https://downloads.mongodb.com/compass/mongosh-1.2.2-linux-x64.tgz', 'https://downloads.mongodb.com/compass/mongosh-1.2.2-linux-x64-openssl11.tgz', 'https://downloads.mongodb.com/compass/mongosh-1.2.2-linux-x64-openssl3.tgz', @@ -67,23 +72,26 @@ describe('DownloadCenter config', function () { it('has an MSI and ZIP artifacts for windows', function () { const version = createVersionConfig(packageInformation('1.2.2')); - const platforms = version.platform.filter( - (p) => p.os === 'win32' || p.os === 'win32msi' + const [platform] = version.platform.filter( + (p) => p.os === 'Windows 64-bit (8.1+)' ); - expect(platforms).to.have.length(2); - expect(platforms.map((p) => p.download_link)).to.deep.equal([ - 'https://downloads.mongodb.com/compass/mongosh-1.2.2-win32-x64.zip', - 'https://downloads.mongodb.com/compass/mongosh-1.2.2-x64.msi', - ]); + expect(platform.packages.links[0].download_link).to.contain( + 'win32-x64.zip' + ); + expect(platform.packages.links[0].name).to.equal('zip'); + expect(platform.packages.links[1].download_link).to.contain('x64.msi'); + expect(platform.packages.links[1].name).to.contain('msi'); }); it('has an artifact for rpm', function () { const version = createVersionConfig(packageInformation('1.2.2')); const platforms = version.platform.filter( - (p) => p.os === 'rpm' && p.arch === 'x64' + (p) => p.os.startsWith('RHEL') && p.arch === 'x64' ); expect(platforms).to.have.length(3); - expect(platforms.map((p) => p.download_link)).to.deep.equal([ + expect( + platforms.flatMap((p) => p.packages.links.map((l) => l.download_link)) + ).to.deep.equal([ 'https://downloads.mongodb.com/compass/mongodb-mongosh-1.2.2.x86_64.rpm', 'https://downloads.mongodb.com/compass/mongodb-mongosh-shared-openssl11-1.2.2.x86_64.rpm', 'https://downloads.mongodb.com/compass/mongodb-mongosh-shared-openssl3-1.2.2.x86_64.rpm', @@ -93,10 +101,12 @@ describe('DownloadCenter config', function () { it('has an artifact for deb', function () { const version = createVersionConfig(packageInformation('1.2.2')); const platforms = version.platform.filter( - (p) => p.os === 'deb' && p.arch === 'x64' + (p) => p.os.startsWith('Debian') && p.arch === 'x64' ); expect(platforms).to.have.length(3); - expect(platforms.map((p) => p.download_link)).to.deep.equal([ + expect( + platforms.flatMap((p) => p.packages.links.map((l) => l.download_link)) + ).to.deep.equal([ 'https://downloads.mongodb.com/compass/mongodb-mongosh_1.2.2_amd64.deb', 'https://downloads.mongodb.com/compass/mongodb-mongosh-shared-openssl11_1.2.2_amd64.deb', 'https://downloads.mongodb.com/compass/mongodb-mongosh-shared-openssl3_1.2.2_amd64.deb', diff --git a/packages/build/src/download-center/config.ts b/packages/build/src/download-center/config.ts index 4c3414bc1a..df07ba094d 100644 --- a/packages/build/src/download-center/config.ts +++ b/packages/build/src/download-center/config.ts @@ -3,7 +3,10 @@ import { validateConfigSchema, } from '@mongodb-js/dl-center'; import { major as majorVersion } from 'semver'; -import type { DownloadCenterConfig } from '@mongodb-js/dl-center/dist/download-center-config'; +import type { + DownloadCenterConfig, + PlatformWithPackages, +} from '@mongodb-js/dl-center/dist/download-center-config'; import { ARTIFACTS_BUCKET, ARTIFACTS_FOLDER, @@ -19,6 +22,7 @@ import { getDistro, getServerLikeArchName, getServerLikeTargetList, + getDownloadCenterPackageType, } from '../config'; import type { PackageInformationProvider } from '../packaging'; import { getPackageFile } from '../packaging'; @@ -134,9 +138,9 @@ export function getUpdatedDownloadCenterConfig( }); if (matchingMajorVersionIdx === -1) { - currentVersions.push(versionConfig); + currentVersions.push(versionConfig as any); } else { - currentVersions[matchingMajorVersionIdx] = versionConfig; + currentVersions[matchingMajorVersionIdx] = versionConfig as any; } return { @@ -151,7 +155,7 @@ export function createDownloadCenterConfig( ): DownloadCenterConfig { const versionConfig = getVersionConfig(); return { - versions: [versionConfig], + versions: [versionConfig as any], manual_link: 'https://docs.mongodb.org/manual/products/mongosh', release_notes_link: `https://github.com/mongodb-js/mongosh/releases/tag/v${versionConfig.version}`, previous_releases_link: '', @@ -166,17 +170,30 @@ export function createVersionConfig( publicArtifactBaseUrl: string = ARTIFACTS_URL_PUBLIC_BASE ) { const { version } = packageInformation('linux-x64').metadata; - return { - _id: version, - version: version, - platform: ALL_PACKAGE_VARIANTS.map((packageVariant: PackageVariant) => ({ + const platformMap: Map = new Map(); + + for (const packageVariant of ALL_PACKAGE_VARIANTS) { + const platformName = getDownloadCenterDistroDescription(packageVariant); + const currentPlatform = platformMap.get(platformName) || { arch: getArch(packageVariant), - os: getDistro(packageVariant), - name: getDownloadCenterDistroDescription(packageVariant), + os: getDownloadCenterDistroDescription(packageVariant), + packages: { links: [] }, + }; + + currentPlatform.packages.links.push({ + name: getDownloadCenterPackageType(packageVariant), download_link: publicArtifactBaseUrl + getPackageFile(packageVariant, packageInformation).path, - })), + }); + + platformMap.set(platformName, currentPlatform); + } + + return { + _id: version, + version: version, + platform: [...platformMap.values()], } as const; } From 625dbb2bc31295528fdce7bc0742350dad318588 Mon Sep 17 00:00:00 2001 From: Kevin Mas Ruiz Date: Wed, 23 Aug 2023 13:07:26 +0200 Subject: [PATCH 02/11] chore: remove .only, pushed by mistake --- packages/build/src/download-center/config.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/build/src/download-center/config.spec.ts b/packages/build/src/download-center/config.spec.ts index 4aea413e3d..502b781eae 100644 --- a/packages/build/src/download-center/config.spec.ts +++ b/packages/build/src/download-center/config.spec.ts @@ -35,7 +35,7 @@ const packageInformation = (version: string) => }; }) as PackageInformationProvider; -describe.only('DownloadCenter config', function () { +describe('DownloadCenter config', function () { describe('createVersionConfig', function () { it('sets the version correctly', function () { const version = createVersionConfig(packageInformation('1.2.2')); From 1d31ff7366022842d7b622209983b9a8aa00ec17 Mon Sep 17 00:00:00 2001 From: Kevin Mas Ruiz Date: Wed, 23 Aug 2023 14:02:44 +0200 Subject: [PATCH 03/11] chore: remove casting --- packages/build/src/download-center/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/build/src/download-center/config.ts b/packages/build/src/download-center/config.ts index df07ba094d..6e9c2ce831 100644 --- a/packages/build/src/download-center/config.ts +++ b/packages/build/src/download-center/config.ts @@ -194,7 +194,7 @@ export function createVersionConfig( _id: version, version: version, platform: [...platformMap.values()], - } as const; + }; } interface JsonFeed { From e4297f222963e9932b68afdda49f6aeda1a65670 Mon Sep 17 00:00:00 2001 From: Kevin Mas Ruiz Date: Wed, 23 Aug 2023 14:22:33 +0200 Subject: [PATCH 04/11] chore: bump dl-center version --- package-lock.json | 44 ++++++++++++++++++------------------- packages/build/package.json | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index 19c436b270..919ce73bcc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9493,6 +9493,16 @@ "node": ">= 12" } }, + "node_modules/@mongodb-js/dl-center": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@mongodb-js/dl-center/-/dl-center-1.1.1.tgz", + "integrity": "sha512-1cqBYtfMdoOtW3D8MNknhbub1Z7SI/31zPRlHMxmFuwjEittESlBBCa/20OVi6QdjxHgi2hE1j9sJqKHM/fkBA==", + "dependencies": { + "ajv": "^6.12.5", + "aws-sdk": "^2.1441.0", + "node-fetch": "^2.6.7" + } + }, "node_modules/@mongodb-js/eslint-config-devtools": { "version": "0.9.9", "resolved": "https://registry.npmjs.org/@mongodb-js/eslint-config-devtools/-/eslint-config-devtools-0.9.9.tgz", @@ -30213,7 +30223,7 @@ "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-github-repo": "^1.0.1", - "@mongodb-js/dl-center": "^0.2.0", + "@mongodb-js/dl-center": "^1.1.1", "@mongodb-js/mongodb-downloader": "^0.2.7", "@octokit/rest": "^17.9.0", "aws-sdk": "^2.674.0", @@ -30254,16 +30264,6 @@ "node": ">=14.15.1" } }, - "packages/build/node_modules/@mongodb-js/dl-center": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@mongodb-js/dl-center/-/dl-center-0.2.0.tgz", - "integrity": "sha512-6JvTZcRJeJ66JrG4WUlX4+3or+/pV4UeaRVOU7c4uB/8zQxDIZiPUalfZiGuQjs7k6il69YDrSqslaATOdqrtQ==", - "dependencies": { - "ajv": "^6.12.5", - "aws-sdk": "^2.1441.0", - "node-fetch": "^2.6.7" - } - }, "packages/build/node_modules/yaml": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz", @@ -38961,6 +38961,16 @@ "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-github-repo/-/devtools-github-repo-1.2.0.tgz", "integrity": "sha512-rBwJHZ0g3Ma6zluNUWfeFXvuxsz9ZtFX2YZ1qR/aQEwk64ZhOqjrVbcROSdtfGUs4qg1JGXFIU+ZQ+oLYqPEvQ==" }, + "@mongodb-js/dl-center": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@mongodb-js/dl-center/-/dl-center-1.1.1.tgz", + "integrity": "sha512-1cqBYtfMdoOtW3D8MNknhbub1Z7SI/31zPRlHMxmFuwjEittESlBBCa/20OVi6QdjxHgi2hE1j9sJqKHM/fkBA==", + "requires": { + "ajv": "^6.12.5", + "aws-sdk": "^2.1441.0", + "node-fetch": "^2.6.7" + } + }, "@mongodb-js/eslint-config-devtools": { "version": "0.9.9", "resolved": "https://registry.npmjs.org/@mongodb-js/eslint-config-devtools/-/eslint-config-devtools-0.9.9.tgz", @@ -39481,7 +39491,7 @@ "version": "file:packages/build", "requires": { "@mongodb-js/devtools-github-repo": "^1.0.1", - "@mongodb-js/dl-center": "^0.2.0", + "@mongodb-js/dl-center": "^1.1.1", "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/mongodb-downloader": "^0.2.7", "@mongodb-js/prettier-config-devtools": "^1.0.1", @@ -39517,16 +39527,6 @@ "yaml": "^2.3.1" }, "dependencies": { - "@mongodb-js/dl-center": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@mongodb-js/dl-center/-/dl-center-0.2.0.tgz", - "integrity": "sha512-6JvTZcRJeJ66JrG4WUlX4+3or+/pV4UeaRVOU7c4uB/8zQxDIZiPUalfZiGuQjs7k6il69YDrSqslaATOdqrtQ==", - "requires": { - "ajv": "^6.12.5", - "aws-sdk": "^2.1441.0", - "node-fetch": "^2.6.7" - } - }, "yaml": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz", diff --git a/packages/build/package.json b/packages/build/package.json index 21395b22e6..939800d008 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -59,7 +59,7 @@ "dependencies": { "@mongodb-js/devtools-github-repo": "^1.0.1", "@mongodb-js/mongodb-downloader": "^0.2.7", - "@mongodb-js/dl-center": "^0.2.0", + "@mongodb-js/dl-center": "^1.1.1", "@octokit/rest": "^17.9.0", "aws-sdk": "^2.674.0", "boxednode": "^2.0.1", From fd1934759330a43b2b03e720cf442eee249da4cd Mon Sep 17 00:00:00 2001 From: Kevin Mas Ruiz Date: Wed, 23 Aug 2023 14:41:26 +0200 Subject: [PATCH 05/11] chore: remove packageType and use the file extension --- config/release-package-matrix.d.ts | 1 - config/release-package-matrix.js | 52 +++++++++---------- packages/build/src/config/build-variant.ts | 12 ----- packages/build/src/download-center/config.ts | 4 +- .../src/packaging/package/get-package-file.ts | 35 +++++++++++-- 5 files changed, 58 insertions(+), 46 deletions(-) diff --git a/config/release-package-matrix.d.ts b/config/release-package-matrix.d.ts index ff0b827187..f37e3c8ddc 100644 --- a/config/release-package-matrix.d.ts +++ b/config/release-package-matrix.d.ts @@ -8,7 +8,6 @@ export interface PackageInformation { name: string; description: string; packageOn: string; - packageType: 'dmg' | 'tar.gz' | 'deb' | 'rpm' | 'zip' | 'msi'; smokeTestKind: 'docker' | 'rpmextract' | 'debextract' | 'none'; smokeTestDockerfiles?: string[]; serverLikeTargetList: string[]; diff --git a/config/release-package-matrix.js b/config/release-package-matrix.js index a357890713..d69261c508 100644 --- a/config/release-package-matrix.js +++ b/config/release-package-matrix.js @@ -13,92 +13,92 @@ exports.RELEASE_PACKAGE_MATRIX = [ executableOsId: 'darwin-x64', compileBuildVariant: 'darwin', packages: [ - { name: 'darwin-x64', description: 'MacOS 64-bit (10.14+)', packageType: 'zip', packageOn: 'darwin', smokeTestKind: 'macos', serverLikeTargetList: ['macos'] } + { name: 'darwin-x64', description: 'MacOS 64-bit (10.14+)', packageOn: 'darwin', smokeTestKind: 'macos', serverLikeTargetList: ['macos'] } ] }, { executableOsId: 'darwin-arm64', compileBuildVariant: 'darwin_arm64', packages: [ - { name: 'darwin-arm64', description: 'MacOS M1 (11.0+)', packageType: 'zip', packageOn: 'darwin', smokeTestKind: 'macos', serverLikeTargetList: ['macos'] } + { name: 'darwin-arm64', description: 'MacOS M1 (11.0+)', packageOn: 'darwin', smokeTestKind: 'macos', serverLikeTargetList: ['macos'] } ] }, { executableOsId: 'linux-x64', compileBuildVariant: 'linux_x64_build', packages: [ - { name: 'linux-x64', description: 'Linux 64-bit', packageType: 'tar.gz', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...allLinux] }, - { name: 'deb-x64', description: 'Debian / Ubuntu 64-bit', packageType: 'deb', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'ubuntu22.04-nohome-deb', 'debian9-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-x64', description: 'RHEL / CentOS / Fedora / Suse 64-bit', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'suse12-rpm', 'suse15-rpm', 'amazonlinux1-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } + { name: 'linux-x64', description: 'Linux 64-bit', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...allLinux] }, + { name: 'deb-x64', description: 'Debian / Ubuntu 64-bit', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'ubuntu22.04-nohome-deb', 'debian9-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-x64', description: 'RHEL / CentOS / Fedora / Suse 64-bit', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'suse12-rpm', 'suse15-rpm', 'amazonlinux1-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } ] }, { executableOsId: 'linux-x64-openssl11', compileBuildVariant: 'linux_x64_build_openssl11', packages: [ - { name: 'linux-x64-openssl11', description: 'Linux 64-bit (shared OpenSSL 1.1)', packageType: 'tar.gz', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, - { name: 'deb-x64-openssl11', description: 'Debian / Ubuntu 64-bit (shared OpenSSL 1.1)', packageType: 'deb', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-x64-openssl11', description: 'RHEL / CentOS 64-bit (shared OpenSSL 1.1)', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-epel-rpm', 'amazonlinux2-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } + { name: 'linux-x64-openssl11', description: 'Linux 64-bit (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, + { name: 'deb-x64-openssl11', description: 'Debian / Ubuntu 64-bit (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-x64-openssl11', description: 'RHEL / CentOS 64-bit (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-epel-rpm', 'amazonlinux2-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } ] }, { executableOsId: 'linux-x64-openssl3', compileBuildVariant: 'linux_x64_build_openssl3', packages: [ - { name: 'linux-x64-openssl3', description: 'Linux 64-bit (shared OpenSSL 3)', packageType: 'tar.gz', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, - { name: 'deb-x64-openssl3', description: 'Debian / Ubuntu 64-bit (shared OpenSSL 3)', packageType: 'deb', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-x64-openssl3', description: 'RHEL / CentOS 64-bit (shared OpenSSL 3)', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } + { name: 'linux-x64-openssl3', description: 'Linux 64-bit (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, + { name: 'deb-x64-openssl3', description: 'Debian / Ubuntu 64-bit (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-x64-openssl3', description: 'RHEL / CentOS 64-bit (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } ] }, { executableOsId: 'linux-arm64', compileBuildVariant: 'linux_arm64_build', packages: [ - { name: 'linux-arm64', description: 'Linux arm64', packageType: 'tar.gz', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...al2AndAbove] }, - { name: 'deb-arm64', description: 'Debian / Ubuntu arm64', packageType: 'deb', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-arm64', description: 'RHEL / CentOS arm64', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } + { name: 'linux-arm64', description: 'Linux arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...al2AndAbove] }, + { name: 'deb-arm64', description: 'Debian / Ubuntu arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-arm64', description: 'RHEL / CentOS arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } ] }, { executableOsId: 'linux-arm64-openssl11', compileBuildVariant: 'linux_arm64_build_openssl11', packages: [ - { name: 'linux-arm64-openssl11', description: 'Linux arm64 (shared OpenSSL 1.1)', packageType: 'tar.gz', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, - { name: 'deb-arm64-openssl11', description: 'Debian / Ubuntu arm64 (shared OpenSSL 1.1)', packageType: 'deb', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-arm64-openssl11', description: 'Redhat / Centos arm64 (shared OpenSSL 1.1)', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm'], serverLikeTargetList: [...al2AndAbove] } + { name: 'linux-arm64-openssl11', description: 'Linux arm64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, + { name: 'deb-arm64-openssl11', description: 'Debian / Ubuntu arm64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-arm64-openssl11', description: 'Redhat / Centos arm64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm'], serverLikeTargetList: [...al2AndAbove] } ] }, { executableOsId: 'linux-arm64-openssl3', compileBuildVariant: 'linux_arm64_build_openssl3', packages: [ - { name: 'linux-arm64-openssl3', description: 'Linux arm64 (shared OpenSSL 3)', packageType: 'tar.gz', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, - { name: 'deb-arm64-openssl3', description: 'Debian / Ubuntu arm64 (shared OpenSSL 3)', packageType: 'deb', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-arm64-openssl3', description: 'RHEL / CentOS arm64 (shared OpenSSL 3)', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } + { name: 'linux-arm64-openssl3', description: 'Linux arm64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, + { name: 'deb-arm64-openssl3', description: 'Debian / Ubuntu arm64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-arm64-openssl3', description: 'RHEL / CentOS arm64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } ] }, { executableOsId: 'linux-ppc64le', compileBuildVariant: 'linux_ppc64le_build', packages: [ - { name: 'linux-ppc64le', description: 'Linux ppc64le', packageType: 'tar.gz', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel81AndAbove] }, - { name: 'rpm-ppc64le', description: 'Redhat / Centos ppc64le', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel81AndAbove] } + { name: 'linux-ppc64le', description: 'Linux ppc64le', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel81AndAbove] }, + { name: 'rpm-ppc64le', description: 'Redhat / Centos ppc64le', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel81AndAbove] } ] }, { executableOsId: 'linux-s390x', compileBuildVariant: 'linux_s390x_build', packages: [ - { name: 'linux-s390x', description: 'Linux s390x', packageType: 'tar.gz', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel72AndAbove] }, - { name: 'rpm-s390x', description: 'Redhat / Centos s390x', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel72AndAbove] } + { name: 'linux-s390x', description: 'Linux s390x', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel72AndAbove] }, + { name: 'rpm-s390x', description: 'Redhat / Centos s390x', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel72AndAbove] } ] }, { executableOsId: 'win32', compileBuildVariant: 'win32_build', packages: [ - { name: 'win32-x64', description: 'Windows 64-bit (8.1+)', packageType: 'zip', packageOn: 'win32', smokeTestKind: 'ssh', serverLikeTargetList: ['windows'] }, - { name: 'win32msi-x64', description: 'Windows 64-bit (8.1+)', packageType: 'msi', packageOn: 'win32', smokeTestKind: 'ssh', serverLikeTargetList: ['windows'] } + { name: 'win32-x64', description: 'Windows 64-bit (8.1+)', packageOn: 'win32', smokeTestKind: 'ssh', serverLikeTargetList: ['windows'] }, + { name: 'win32msi-x64', description: 'Windows 64-bit (8.1+)', packageOn: 'win32', smokeTestKind: 'ssh', serverLikeTargetList: ['windows'] } ] } ]; diff --git a/packages/build/src/config/build-variant.ts b/packages/build/src/config/build-variant.ts index e6964e6c94..2fba32bde5 100644 --- a/packages/build/src/config/build-variant.ts +++ b/packages/build/src/config/build-variant.ts @@ -114,15 +114,3 @@ export function getDownloadCenterDistroDescription( throw new Error(`${variant} is not a valid build variant`); } - -export function getDownloadCenterPackageType(variant: PackageVariant): string { - for (const { packages } of RELEASE_PACKAGE_MATRIX) { - for (const pkg of packages) { - if (pkg.name === variant) { - return pkg.packageType; - } - } - } - - throw new Error(`${variant} is not a valid build variant`); -} diff --git a/packages/build/src/download-center/config.ts b/packages/build/src/download-center/config.ts index 6e9c2ce831..4e8acf78f8 100644 --- a/packages/build/src/download-center/config.ts +++ b/packages/build/src/download-center/config.ts @@ -22,7 +22,6 @@ import { getDistro, getServerLikeArchName, getServerLikeTargetList, - getDownloadCenterPackageType, } from '../config'; import type { PackageInformationProvider } from '../packaging'; import { getPackageFile } from '../packaging'; @@ -33,6 +32,7 @@ import fetch from 'node-fetch'; import path from 'path'; import { promisify } from 'util'; import semver from 'semver'; +import { getFileExtension } from '../packaging/package'; const delay = promisify(setTimeout); @@ -181,7 +181,7 @@ export function createVersionConfig( }; currentPlatform.packages.links.push({ - name: getDownloadCenterPackageType(packageVariant), + name: getFileExtension(packageVariant), download_link: publicArtifactBaseUrl + getPackageFile(packageVariant, packageInformation).path, diff --git a/packages/build/src/packaging/package/get-package-file.ts b/packages/build/src/packaging/package/get-package-file.ts index 115fa88b7c..eaead18077 100644 --- a/packages/build/src/packaging/package/get-package-file.ts +++ b/packages/build/src/packaging/package/get-package-file.ts @@ -12,23 +12,48 @@ export interface PackageFile { contentType: string; } +type PackageFileExtension = 'dmg' | 'tgz' | 'deb' | 'rpm' | 'zip' | 'msi'; + +export function getFileExtension( + packageVariant: PackageVariant +): PackageFileExtension { + switch (getDistro(packageVariant)) { + case 'linux': + return 'tgz'; + case 'rpm': + return 'rpm'; + case 'deb': + return 'deb'; + case 'darwin': + case 'win32': + return 'zip'; + case 'win32msi': + return 'msi'; + default: + throw new Error(`Unknown build variant: ${packageVariant}`); + } +} + export function getPackageFile( packageVariant: PackageVariant, packageInformation: PackageInformationProvider ): PackageFile { const { version, name, debName, rpmName } = packageInformation(packageVariant).metadata; + + const fileExtension = getFileExtension(packageVariant); + switch (getDistro(packageVariant)) { case 'linux': return { - path: `${name}-${version}-${packageVariant}.tgz`, + path: `${name}-${version}-${packageVariant}.${fileExtension}`, contentType: 'application/gzip', }; case 'rpm': return { path: `${rpmName}-${version}.${getRPMArchName( getArch(packageVariant) - )}.rpm`, + )}.${fileExtension}`, contentType: 'application/x-rpm', }; case 'deb': @@ -38,18 +63,18 @@ export function getPackageFile( return { path: `${debName}_${version}_${getDebArchName( getArch(packageVariant) - )}.deb`, + )}.${fileExtension}`, contentType: 'application/vnd.debian.binary-package', }; case 'darwin': case 'win32': return { - path: `${name}-${version}-${packageVariant}.zip`, + path: `${name}-${version}-${packageVariant}.${fileExtension}`, contentType: 'application/zip', }; case 'win32msi': return { - path: `${name}-${version}-${getArch(packageVariant)}.msi`, + path: `${name}-${version}-${getArch(packageVariant)}.${fileExtension}`, contentType: 'application/x-msi', }; default: From 3dffea168d8b0e2096688002265df59856868ceb Mon Sep 17 00:00:00 2001 From: Kevin Mas Ruiz Date: Wed, 23 Aug 2023 14:48:20 +0200 Subject: [PATCH 06/11] chore: remove as any castings --- packages/build/src/download-center/config.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/build/src/download-center/config.ts b/packages/build/src/download-center/config.ts index 4e8acf78f8..bf5ba6006c 100644 --- a/packages/build/src/download-center/config.ts +++ b/packages/build/src/download-center/config.ts @@ -138,9 +138,9 @@ export function getUpdatedDownloadCenterConfig( }); if (matchingMajorVersionIdx === -1) { - currentVersions.push(versionConfig as any); + currentVersions.push(versionConfig); } else { - currentVersions[matchingMajorVersionIdx] = versionConfig as any; + currentVersions[matchingMajorVersionIdx] = versionConfig; } return { @@ -155,7 +155,7 @@ export function createDownloadCenterConfig( ): DownloadCenterConfig { const versionConfig = getVersionConfig(); return { - versions: [versionConfig as any], + versions: [versionConfig], manual_link: 'https://docs.mongodb.org/manual/products/mongosh', release_notes_link: `https://github.com/mongodb-js/mongosh/releases/tag/v${versionConfig.version}`, previous_releases_link: '', From 34f966cfb6c223d7093b9d55b2068d6bded6561f Mon Sep 17 00:00:00 2001 From: Kevin Mas Ruiz Date: Wed, 23 Aug 2023 15:16:05 +0200 Subject: [PATCH 07/11] chore: fix descriptions in the release matrix --- config/release-package-matrix.js | 40 +++++++++---------- .../build/src/download-center/config.spec.ts | 8 ++-- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/config/release-package-matrix.js b/config/release-package-matrix.js index d69261c508..228c85b5a5 100644 --- a/config/release-package-matrix.js +++ b/config/release-package-matrix.js @@ -13,7 +13,7 @@ exports.RELEASE_PACKAGE_MATRIX = [ executableOsId: 'darwin-x64', compileBuildVariant: 'darwin', packages: [ - { name: 'darwin-x64', description: 'MacOS 64-bit (10.14+)', packageOn: 'darwin', smokeTestKind: 'macos', serverLikeTargetList: ['macos'] } + { name: 'darwin-x64', description: 'MacOS x64 (10.14+)', packageOn: 'darwin', smokeTestKind: 'macos', serverLikeTargetList: ['macos'] } ] }, { @@ -27,27 +27,27 @@ exports.RELEASE_PACKAGE_MATRIX = [ executableOsId: 'linux-x64', compileBuildVariant: 'linux_x64_build', packages: [ - { name: 'linux-x64', description: 'Linux 64-bit', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...allLinux] }, - { name: 'deb-x64', description: 'Debian / Ubuntu 64-bit', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'ubuntu22.04-nohome-deb', 'debian9-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-x64', description: 'RHEL / CentOS / Fedora / Suse 64-bit', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'suse12-rpm', 'suse15-rpm', 'amazonlinux1-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } + { name: 'linux-x64', description: 'Linux x64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...allLinux] }, + { name: 'deb-x64', description: 'Debian / Ubuntu (18.04+) x64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'ubuntu22.04-nohome-deb', 'debian9-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-x64', description: 'RHEL / CentOS (7+) x64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'suse12-rpm', 'suse15-rpm', 'amazonlinux1-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } ] }, { executableOsId: 'linux-x64-openssl11', compileBuildVariant: 'linux_x64_build_openssl11', packages: [ - { name: 'linux-x64-openssl11', description: 'Linux 64-bit (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, - { name: 'deb-x64-openssl11', description: 'Debian / Ubuntu 64-bit (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-x64-openssl11', description: 'RHEL / CentOS 64-bit (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-epel-rpm', 'amazonlinux2-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } + { name: 'linux-x64-openssl11', description: 'Linux x64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, + { name: 'deb-x64-openssl11', description: 'Debian (+10) / Ubuntu (18.04+) x64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-x64-openssl11', description: 'RHEL / CentOS (7+) x64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-epel-rpm', 'amazonlinux2-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } ] }, { executableOsId: 'linux-x64-openssl3', compileBuildVariant: 'linux_x64_build_openssl3', packages: [ - { name: 'linux-x64-openssl3', description: 'Linux 64-bit (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, - { name: 'deb-x64-openssl3', description: 'Debian / Ubuntu 64-bit (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-x64-openssl3', description: 'RHEL / CentOS 64-bit (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } + { name: 'linux-x64-openssl3', description: 'Linux x64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, + { name: 'deb-x64-openssl3', description: 'Debian (+10) / Ubuntu (18.04+) x64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-x64-openssl3', description: 'RHEL / CentOS (7+) x64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } ] }, { @@ -55,8 +55,8 @@ exports.RELEASE_PACKAGE_MATRIX = [ compileBuildVariant: 'linux_arm64_build', packages: [ { name: 'linux-arm64', description: 'Linux arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...al2AndAbove] }, - { name: 'deb-arm64', description: 'Debian / Ubuntu arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-arm64', description: 'RHEL / CentOS arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } + { name: 'deb-arm64', description: 'Debian (+10) / Ubuntu (18.04+) arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-arm64', description: 'RHEL / CentOS (7+) arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } ] }, { @@ -64,8 +64,8 @@ exports.RELEASE_PACKAGE_MATRIX = [ compileBuildVariant: 'linux_arm64_build_openssl11', packages: [ { name: 'linux-arm64-openssl11', description: 'Linux arm64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, - { name: 'deb-arm64-openssl11', description: 'Debian / Ubuntu arm64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-arm64-openssl11', description: 'Redhat / Centos arm64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm'], serverLikeTargetList: [...al2AndAbove] } + { name: 'deb-arm64-openssl11', description: 'Debian (+10) / Ubuntu (18.04+) arm64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-arm64-openssl11', description: 'RHEL / CentOS (7+) arm64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm'], serverLikeTargetList: [...al2AndAbove] } ] }, { @@ -73,8 +73,8 @@ exports.RELEASE_PACKAGE_MATRIX = [ compileBuildVariant: 'linux_arm64_build_openssl3', packages: [ { name: 'linux-arm64-openssl3', description: 'Linux arm64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, - { name: 'deb-arm64-openssl3', description: 'Debian / Ubuntu arm64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-arm64-openssl3', description: 'RHEL / CentOS arm64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } + { name: 'deb-arm64-openssl3', description: 'Debian (+10) / Ubuntu (18.04+) arm64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-arm64-openssl3', description: 'RHEL / CentOS (7+) arm64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } ] }, { @@ -82,7 +82,7 @@ exports.RELEASE_PACKAGE_MATRIX = [ compileBuildVariant: 'linux_ppc64le_build', packages: [ { name: 'linux-ppc64le', description: 'Linux ppc64le', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel81AndAbove] }, - { name: 'rpm-ppc64le', description: 'Redhat / Centos ppc64le', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel81AndAbove] } + { name: 'rpm-ppc64le', description: 'RHEL / CentOS (7+) ppc64le', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel81AndAbove] } ] }, { @@ -90,15 +90,15 @@ exports.RELEASE_PACKAGE_MATRIX = [ compileBuildVariant: 'linux_s390x_build', packages: [ { name: 'linux-s390x', description: 'Linux s390x', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel72AndAbove] }, - { name: 'rpm-s390x', description: 'Redhat / Centos s390x', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel72AndAbove] } + { name: 'rpm-s390x', description: 'RHEL / CentOS (7+) s390x', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel72AndAbove] } ] }, { executableOsId: 'win32', compileBuildVariant: 'win32_build', packages: [ - { name: 'win32-x64', description: 'Windows 64-bit (8.1+)', packageOn: 'win32', smokeTestKind: 'ssh', serverLikeTargetList: ['windows'] }, - { name: 'win32msi-x64', description: 'Windows 64-bit (8.1+)', packageOn: 'win32', smokeTestKind: 'ssh', serverLikeTargetList: ['windows'] } + { name: 'win32-x64', description: 'Windows x64 (8.1+)', packageOn: 'win32', smokeTestKind: 'ssh', serverLikeTargetList: ['windows'] }, + { name: 'win32msi-x64', description: 'Windows x64 (8.1+)', packageOn: 'win32', smokeTestKind: 'ssh', serverLikeTargetList: ['windows'] } ] } ]; diff --git a/packages/build/src/download-center/config.spec.ts b/packages/build/src/download-center/config.spec.ts index 502b781eae..47939710ef 100644 --- a/packages/build/src/download-center/config.spec.ts +++ b/packages/build/src/download-center/config.spec.ts @@ -43,10 +43,10 @@ describe('DownloadCenter config', function () { expect(version.version).to.equal('1.2.2'); }); - it('has an artifact for MacOS 64-bit (10.14+)', function () { + it('has an artifact for MacOS x64 (10.14+)', function () { const version = createVersionConfig(packageInformation('1.2.2')); const platforms = version.platform.filter( - (p) => (p.os as string) === 'MacOS 64-bit (10.14+)' + (p) => (p.os as string) === 'MacOS x64 (10.14+)' ) as any as PlatformWithPackages[]; expect(platforms).to.have.length(1); expect(platforms[0].packages.links[0].name).to.include('zip'); @@ -58,7 +58,7 @@ describe('DownloadCenter config', function () { it('has an artifact for linux', function () { const version = createVersionConfig(packageInformation('1.2.2')); const platforms = version.platform.filter( - (p) => p.os.startsWith('Linux 64-bit') && p.arch === 'x64' + (p) => p.os.startsWith('Linux x64') && p.arch === 'x64' ); expect(platforms).to.have.length(3); expect( @@ -73,7 +73,7 @@ describe('DownloadCenter config', function () { it('has an MSI and ZIP artifacts for windows', function () { const version = createVersionConfig(packageInformation('1.2.2')); const [platform] = version.platform.filter( - (p) => p.os === 'Windows 64-bit (8.1+)' + (p) => p.os === 'Windows x64 (8.1+)' ); expect(platform.packages.links[0].download_link).to.contain( 'win32-x64.zip' From 2f252e2e2a9d846182938dbb42d8cde55f371d31 Mon Sep 17 00:00:00 2001 From: Kevin Mas Ruiz Date: Wed, 23 Aug 2023 15:20:10 +0200 Subject: [PATCH 08/11] chore: fix debian naming --- config/release-package-matrix.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/release-package-matrix.js b/config/release-package-matrix.js index 228c85b5a5..c0d0a46765 100644 --- a/config/release-package-matrix.js +++ b/config/release-package-matrix.js @@ -28,7 +28,7 @@ exports.RELEASE_PACKAGE_MATRIX = [ compileBuildVariant: 'linux_x64_build', packages: [ { name: 'linux-x64', description: 'Linux x64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...allLinux] }, - { name: 'deb-x64', description: 'Debian / Ubuntu (18.04+) x64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'ubuntu22.04-nohome-deb', 'debian9-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'deb-x64', description: 'Debian (10+) / Ubuntu (18.04+) x64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'ubuntu22.04-nohome-deb', 'debian9-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, { name: 'rpm-x64', description: 'RHEL / CentOS (7+) x64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'suse12-rpm', 'suse15-rpm', 'amazonlinux1-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } ] }, @@ -37,7 +37,7 @@ exports.RELEASE_PACKAGE_MATRIX = [ compileBuildVariant: 'linux_x64_build_openssl11', packages: [ { name: 'linux-x64-openssl11', description: 'Linux x64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, - { name: 'deb-x64-openssl11', description: 'Debian (+10) / Ubuntu (18.04+) x64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'deb-x64-openssl11', description: 'Debian (10+) / Ubuntu (18.04+) x64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, { name: 'rpm-x64-openssl11', description: 'RHEL / CentOS (7+) x64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-epel-rpm', 'amazonlinux2-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } ] }, @@ -46,7 +46,7 @@ exports.RELEASE_PACKAGE_MATRIX = [ compileBuildVariant: 'linux_x64_build_openssl3', packages: [ { name: 'linux-x64-openssl3', description: 'Linux x64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, - { name: 'deb-x64-openssl3', description: 'Debian (+10) / Ubuntu (18.04+) x64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'deb-x64-openssl3', description: 'Debian (10+) / Ubuntu (18.04+) x64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, { name: 'rpm-x64-openssl3', description: 'RHEL / CentOS (7+) x64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } ] }, @@ -55,7 +55,7 @@ exports.RELEASE_PACKAGE_MATRIX = [ compileBuildVariant: 'linux_arm64_build', packages: [ { name: 'linux-arm64', description: 'Linux arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...al2AndAbove] }, - { name: 'deb-arm64', description: 'Debian (+10) / Ubuntu (18.04+) arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'deb-arm64', description: 'Debian (10+) / Ubuntu (18.04+) arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, { name: 'rpm-arm64', description: 'RHEL / CentOS (7+) arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } ] }, @@ -64,7 +64,7 @@ exports.RELEASE_PACKAGE_MATRIX = [ compileBuildVariant: 'linux_arm64_build_openssl11', packages: [ { name: 'linux-arm64-openssl11', description: 'Linux arm64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, - { name: 'deb-arm64-openssl11', description: 'Debian (+10) / Ubuntu (18.04+) arm64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'deb-arm64-openssl11', description: 'Debian (10+) / Ubuntu (18.04+) arm64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, { name: 'rpm-arm64-openssl11', description: 'RHEL / CentOS (7+) arm64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm'], serverLikeTargetList: [...al2AndAbove] } ] }, @@ -73,7 +73,7 @@ exports.RELEASE_PACKAGE_MATRIX = [ compileBuildVariant: 'linux_arm64_build_openssl3', packages: [ { name: 'linux-arm64-openssl3', description: 'Linux arm64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, - { name: 'deb-arm64-openssl3', description: 'Debian (+10) / Ubuntu (18.04+) arm64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'deb-arm64-openssl3', description: 'Debian (10+) / Ubuntu (18.04+) arm64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, { name: 'rpm-arm64-openssl3', description: 'RHEL / CentOS (7+) arm64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } ] }, From 9f2d308bd3a001c92f8172a8cc4951d55a1f475a Mon Sep 17 00:00:00 2001 From: Kevin Mas Ruiz Date: Wed, 23 Aug 2023 16:11:08 +0200 Subject: [PATCH 09/11] chore: group shared and static libraries on the same platform --- config/release-package-matrix.d.ts | 1 + config/release-package-matrix.js | 52 +++++++++---------- packages/build/src/config/build-variant.ts | 12 +++++ .../build/src/download-center/config.spec.ts | 10 ++-- packages/build/src/download-center/config.ts | 4 +- 5 files changed, 46 insertions(+), 33 deletions(-) diff --git a/config/release-package-matrix.d.ts b/config/release-package-matrix.d.ts index f37e3c8ddc..a6dcb0077a 100644 --- a/config/release-package-matrix.d.ts +++ b/config/release-package-matrix.d.ts @@ -8,6 +8,7 @@ export interface PackageInformation { name: string; description: string; packageOn: string; + packageType: string; smokeTestKind: 'docker' | 'rpmextract' | 'debextract' | 'none'; smokeTestDockerfiles?: string[]; serverLikeTargetList: string[]; diff --git a/config/release-package-matrix.js b/config/release-package-matrix.js index c0d0a46765..cbabe5d964 100644 --- a/config/release-package-matrix.js +++ b/config/release-package-matrix.js @@ -13,92 +13,92 @@ exports.RELEASE_PACKAGE_MATRIX = [ executableOsId: 'darwin-x64', compileBuildVariant: 'darwin', packages: [ - { name: 'darwin-x64', description: 'MacOS x64 (10.14+)', packageOn: 'darwin', smokeTestKind: 'macos', serverLikeTargetList: ['macos'] } + { name: 'darwin-x64', description: 'MacOS x64 (10.14+)', packageType: 'zip', packageOn: 'darwin', smokeTestKind: 'macos', serverLikeTargetList: ['macos'] } ] }, { executableOsId: 'darwin-arm64', compileBuildVariant: 'darwin_arm64', packages: [ - { name: 'darwin-arm64', description: 'MacOS M1 (11.0+)', packageOn: 'darwin', smokeTestKind: 'macos', serverLikeTargetList: ['macos'] } + { name: 'darwin-arm64', description: 'MacOS M1 (11.0+)', packageType: 'zip', packageOn: 'darwin', smokeTestKind: 'macos', serverLikeTargetList: ['macos'] } ] }, { executableOsId: 'linux-x64', compileBuildVariant: 'linux_x64_build', packages: [ - { name: 'linux-x64', description: 'Linux x64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...allLinux] }, - { name: 'deb-x64', description: 'Debian (10+) / Ubuntu (18.04+) x64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'ubuntu22.04-nohome-deb', 'debian9-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-x64', description: 'RHEL / CentOS (7+) x64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'suse12-rpm', 'suse15-rpm', 'amazonlinux1-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } + { name: 'linux-x64', description: 'Linux x64', packageType: 'zip', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...allLinux] }, + { name: 'deb-x64', description: 'Debian (10+) / Ubuntu (18.04+) x64', packageType: 'deb', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'ubuntu22.04-nohome-deb', 'debian9-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-x64', description: 'RHEL / CentOS (7+) x64', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'suse12-rpm', 'suse15-rpm', 'amazonlinux1-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } ] }, { executableOsId: 'linux-x64-openssl11', compileBuildVariant: 'linux_x64_build_openssl11', packages: [ - { name: 'linux-x64-openssl11', description: 'Linux x64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, - { name: 'deb-x64-openssl11', description: 'Debian (10+) / Ubuntu (18.04+) x64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-x64-openssl11', description: 'RHEL / CentOS (7+) x64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-epel-rpm', 'amazonlinux2-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } + { name: 'linux-x64-openssl11', description: 'Linux x64', packageType: 'zip with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, + { name: 'deb-x64-openssl11', description: 'Debian (10+) / Ubuntu (18.04+) x64', packageType: 'deb with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-x64-openssl11', description: 'RHEL / CentOS (7+) x64', packageType: 'rpm with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-epel-rpm', 'amazonlinux2-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } ] }, { executableOsId: 'linux-x64-openssl3', compileBuildVariant: 'linux_x64_build_openssl3', packages: [ - { name: 'linux-x64-openssl3', description: 'Linux x64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, - { name: 'deb-x64-openssl3', description: 'Debian (10+) / Ubuntu (18.04+) x64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-x64-openssl3', description: 'RHEL / CentOS (7+) x64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } + { name: 'linux-x64-openssl3', description: 'Linux x64', packageType: 'zip with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, + { name: 'deb-x64-openssl3', description: 'Debian (10+) / Ubuntu (18.04+) x64', packageType: 'deb with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-x64-openssl3', description: 'RHEL / CentOS (7+) x64', packageType: 'rpm with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } ] }, { executableOsId: 'linux-arm64', compileBuildVariant: 'linux_arm64_build', packages: [ - { name: 'linux-arm64', description: 'Linux arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...al2AndAbove] }, - { name: 'deb-arm64', description: 'Debian (10+) / Ubuntu (18.04+) arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-arm64', description: 'RHEL / CentOS (7+) arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } + { name: 'linux-arm64', description: 'Linux arm64', packageOn: 'linux_package', packageType: 'zip', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...al2AndAbove] }, + { name: 'deb-arm64', description: 'Debian (10+) / Ubuntu (18.04+) arm64', packageType: 'deb', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-arm64', description: 'RHEL / CentOS (7+) arm64', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } ] }, { executableOsId: 'linux-arm64-openssl11', compileBuildVariant: 'linux_arm64_build_openssl11', packages: [ - { name: 'linux-arm64-openssl11', description: 'Linux arm64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, - { name: 'deb-arm64-openssl11', description: 'Debian (10+) / Ubuntu (18.04+) arm64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-arm64-openssl11', description: 'RHEL / CentOS (7+) arm64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm'], serverLikeTargetList: [...al2AndAbove] } + { name: 'linux-arm64-openssl11', description: 'Linux arm64', packageType: 'zip with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, + { name: 'deb-arm64-openssl11', description: 'Debian (10+) / Ubuntu (18.04+) arm64', packageType: 'deb with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-arm64-openssl11', description: 'RHEL / CentOS (7+) arm64', packageType: 'rpm with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm'], serverLikeTargetList: [...al2AndAbove] } ] }, { executableOsId: 'linux-arm64-openssl3', compileBuildVariant: 'linux_arm64_build_openssl3', packages: [ - { name: 'linux-arm64-openssl3', description: 'Linux arm64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, - { name: 'deb-arm64-openssl3', description: 'Debian (10+) / Ubuntu (18.04+) arm64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-arm64-openssl3', description: 'RHEL / CentOS (7+) arm64 (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } + { name: 'linux-arm64-openssl3', description: 'Linux arm64', packageType: 'zip with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, + { name: 'deb-arm64-openssl3', description: 'Debian (10+) / Ubuntu (18.04+) arm64', packageType: 'deb with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-arm64-openssl3', description: 'RHEL / CentOS (7+) arm64', packageType: 'rpm with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } ] }, { executableOsId: 'linux-ppc64le', compileBuildVariant: 'linux_ppc64le_build', packages: [ - { name: 'linux-ppc64le', description: 'Linux ppc64le', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel81AndAbove] }, - { name: 'rpm-ppc64le', description: 'RHEL / CentOS (7+) ppc64le', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel81AndAbove] } + { name: 'linux-ppc64le', description: 'Linux ppc64le', packageType: 'zip', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel81AndAbove] }, + { name: 'rpm-ppc64le', description: 'RHEL / CentOS (7+) ppc64le', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel81AndAbove] } ] }, { executableOsId: 'linux-s390x', compileBuildVariant: 'linux_s390x_build', packages: [ - { name: 'linux-s390x', description: 'Linux s390x', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel72AndAbove] }, - { name: 'rpm-s390x', description: 'RHEL / CentOS (7+) s390x', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel72AndAbove] } + { name: 'linux-s390x', description: 'Linux s390x', packageType: 'zip', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel72AndAbove] }, + { name: 'rpm-s390x', description: 'RHEL / CentOS (7+) s390x', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel72AndAbove] } ] }, { executableOsId: 'win32', compileBuildVariant: 'win32_build', packages: [ - { name: 'win32-x64', description: 'Windows x64 (8.1+)', packageOn: 'win32', smokeTestKind: 'ssh', serverLikeTargetList: ['windows'] }, - { name: 'win32msi-x64', description: 'Windows x64 (8.1+)', packageOn: 'win32', smokeTestKind: 'ssh', serverLikeTargetList: ['windows'] } + { name: 'win32-x64', description: 'Windows x64 (8.1+)', packageType: 'zip', packageOn: 'win32', smokeTestKind: 'ssh', serverLikeTargetList: ['windows'] }, + { name: 'win32msi-x64', description: 'Windows x64 (8.1+)', packageType: 'msi', packageOn: 'win32', smokeTestKind: 'ssh', serverLikeTargetList: ['windows'] } ] } ]; diff --git a/packages/build/src/config/build-variant.ts b/packages/build/src/config/build-variant.ts index 2fba32bde5..e6964e6c94 100644 --- a/packages/build/src/config/build-variant.ts +++ b/packages/build/src/config/build-variant.ts @@ -114,3 +114,15 @@ export function getDownloadCenterDistroDescription( throw new Error(`${variant} is not a valid build variant`); } + +export function getDownloadCenterPackageType(variant: PackageVariant): string { + for (const { packages } of RELEASE_PACKAGE_MATRIX) { + for (const pkg of packages) { + if (pkg.name === variant) { + return pkg.packageType; + } + } + } + + throw new Error(`${variant} is not a valid build variant`); +} diff --git a/packages/build/src/download-center/config.spec.ts b/packages/build/src/download-center/config.spec.ts index 47939710ef..b68ef41e28 100644 --- a/packages/build/src/download-center/config.spec.ts +++ b/packages/build/src/download-center/config.spec.ts @@ -46,8 +46,8 @@ describe('DownloadCenter config', function () { it('has an artifact for MacOS x64 (10.14+)', function () { const version = createVersionConfig(packageInformation('1.2.2')); const platforms = version.platform.filter( - (p) => (p.os as string) === 'MacOS x64 (10.14+)' - ) as any as PlatformWithPackages[]; + (p) => p.os === 'MacOS x64 (10.14+)' + ); expect(platforms).to.have.length(1); expect(platforms[0].packages.links[0].name).to.include('zip'); expect(platforms[0].packages.links[0].download_link).to.include( @@ -60,7 +60,7 @@ describe('DownloadCenter config', function () { const platforms = version.platform.filter( (p) => p.os.startsWith('Linux x64') && p.arch === 'x64' ); - expect(platforms).to.have.length(3); + expect(platforms).to.have.length(1); expect( platforms.flatMap((p) => p.packages.links.map((l) => l.download_link)) ).to.deep.equal([ @@ -88,7 +88,7 @@ describe('DownloadCenter config', function () { const platforms = version.platform.filter( (p) => p.os.startsWith('RHEL') && p.arch === 'x64' ); - expect(platforms).to.have.length(3); + expect(platforms).to.have.length(1); expect( platforms.flatMap((p) => p.packages.links.map((l) => l.download_link)) ).to.deep.equal([ @@ -103,7 +103,7 @@ describe('DownloadCenter config', function () { const platforms = version.platform.filter( (p) => p.os.startsWith('Debian') && p.arch === 'x64' ); - expect(platforms).to.have.length(3); + expect(platforms).to.have.length(1); expect( platforms.flatMap((p) => p.packages.links.map((l) => l.download_link)) ).to.deep.equal([ diff --git a/packages/build/src/download-center/config.ts b/packages/build/src/download-center/config.ts index bf5ba6006c..de3162521b 100644 --- a/packages/build/src/download-center/config.ts +++ b/packages/build/src/download-center/config.ts @@ -22,6 +22,7 @@ import { getDistro, getServerLikeArchName, getServerLikeTargetList, + getDownloadCenterPackageType, } from '../config'; import type { PackageInformationProvider } from '../packaging'; import { getPackageFile } from '../packaging'; @@ -32,7 +33,6 @@ import fetch from 'node-fetch'; import path from 'path'; import { promisify } from 'util'; import semver from 'semver'; -import { getFileExtension } from '../packaging/package'; const delay = promisify(setTimeout); @@ -181,7 +181,7 @@ export function createVersionConfig( }; currentPlatform.packages.links.push({ - name: getFileExtension(packageVariant), + name: getDownloadCenterPackageType(packageVariant), download_link: publicArtifactBaseUrl + getPackageFile(packageVariant, packageInformation).path, From 3b5d01a9312dffae5352299a70c3adff1ee4d413 Mon Sep 17 00:00:00 2001 From: Kevin Mas Ruiz Date: Wed, 23 Aug 2023 16:23:23 +0200 Subject: [PATCH 10/11] chore: fix typo, it's a tgz, not a zip file --- config/release-package-matrix.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/config/release-package-matrix.js b/config/release-package-matrix.js index cbabe5d964..e4c34522df 100644 --- a/config/release-package-matrix.js +++ b/config/release-package-matrix.js @@ -27,7 +27,7 @@ exports.RELEASE_PACKAGE_MATRIX = [ executableOsId: 'linux-x64', compileBuildVariant: 'linux_x64_build', packages: [ - { name: 'linux-x64', description: 'Linux x64', packageType: 'zip', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...allLinux] }, + { name: 'linux-x64', description: 'Linux x64', packageType: 'tgz', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...allLinux] }, { name: 'deb-x64', description: 'Debian (10+) / Ubuntu (18.04+) x64', packageType: 'deb', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'ubuntu22.04-nohome-deb', 'debian9-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, { name: 'rpm-x64', description: 'RHEL / CentOS (7+) x64', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'suse12-rpm', 'suse15-rpm', 'amazonlinux1-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } ] @@ -36,7 +36,7 @@ exports.RELEASE_PACKAGE_MATRIX = [ executableOsId: 'linux-x64-openssl11', compileBuildVariant: 'linux_x64_build_openssl11', packages: [ - { name: 'linux-x64-openssl11', description: 'Linux x64', packageType: 'zip with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, + { name: 'linux-x64-openssl11', description: 'Linux x64', packageType: 'tgz with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, { name: 'deb-x64-openssl11', description: 'Debian (10+) / Ubuntu (18.04+) x64', packageType: 'deb with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, { name: 'rpm-x64-openssl11', description: 'RHEL / CentOS (7+) x64', packageType: 'rpm with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-epel-rpm', 'amazonlinux2-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } ] @@ -45,7 +45,7 @@ exports.RELEASE_PACKAGE_MATRIX = [ executableOsId: 'linux-x64-openssl3', compileBuildVariant: 'linux_x64_build_openssl3', packages: [ - { name: 'linux-x64-openssl3', description: 'Linux x64', packageType: 'zip with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, + { name: 'linux-x64-openssl3', description: 'Linux x64', packageType: 'tgz with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, { name: 'deb-x64-openssl3', description: 'Debian (10+) / Ubuntu (18.04+) x64', packageType: 'deb with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, { name: 'rpm-x64-openssl3', description: 'RHEL / CentOS (7+) x64', packageType: 'rpm with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } ] @@ -54,7 +54,7 @@ exports.RELEASE_PACKAGE_MATRIX = [ executableOsId: 'linux-arm64', compileBuildVariant: 'linux_arm64_build', packages: [ - { name: 'linux-arm64', description: 'Linux arm64', packageOn: 'linux_package', packageType: 'zip', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...al2AndAbove] }, + { name: 'linux-arm64', packageOn: 'linux_package', description: 'Linux arm64', packageType: 'tgz', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...al2AndAbove] }, { name: 'deb-arm64', description: 'Debian (10+) / Ubuntu (18.04+) arm64', packageType: 'deb', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, { name: 'rpm-arm64', description: 'RHEL / CentOS (7+) arm64', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } ] @@ -63,7 +63,7 @@ exports.RELEASE_PACKAGE_MATRIX = [ executableOsId: 'linux-arm64-openssl11', compileBuildVariant: 'linux_arm64_build_openssl11', packages: [ - { name: 'linux-arm64-openssl11', description: 'Linux arm64', packageType: 'zip with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, + { name: 'linux-arm64-openssl11', description: 'Linux arm64', packageType: 'tgz with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, { name: 'deb-arm64-openssl11', description: 'Debian (10+) / Ubuntu (18.04+) arm64', packageType: 'deb with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, { name: 'rpm-arm64-openssl11', description: 'RHEL / CentOS (7+) arm64', packageType: 'rpm with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm'], serverLikeTargetList: [...al2AndAbove] } ] @@ -72,7 +72,7 @@ exports.RELEASE_PACKAGE_MATRIX = [ executableOsId: 'linux-arm64-openssl3', compileBuildVariant: 'linux_arm64_build_openssl3', packages: [ - { name: 'linux-arm64-openssl3', description: 'Linux arm64', packageType: 'zip with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, + { name: 'linux-arm64-openssl3', description: 'Linux arm64', packageType: 'tgz with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, { name: 'deb-arm64-openssl3', description: 'Debian (10+) / Ubuntu (18.04+) arm64', packageType: 'deb with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, { name: 'rpm-arm64-openssl3', description: 'RHEL / CentOS (7+) arm64', packageType: 'rpm with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } ] @@ -81,7 +81,7 @@ exports.RELEASE_PACKAGE_MATRIX = [ executableOsId: 'linux-ppc64le', compileBuildVariant: 'linux_ppc64le_build', packages: [ - { name: 'linux-ppc64le', description: 'Linux ppc64le', packageType: 'zip', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel81AndAbove] }, + { name: 'linux-ppc64le', description: 'Linux ppc64le', packageType: 'tgz', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel81AndAbove] }, { name: 'rpm-ppc64le', description: 'RHEL / CentOS (7+) ppc64le', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel81AndAbove] } ] }, @@ -89,7 +89,7 @@ exports.RELEASE_PACKAGE_MATRIX = [ executableOsId: 'linux-s390x', compileBuildVariant: 'linux_s390x_build', packages: [ - { name: 'linux-s390x', description: 'Linux s390x', packageType: 'zip', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel72AndAbove] }, + { name: 'linux-s390x', description: 'Linux s390x', packageType: 'tgz', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel72AndAbove] }, { name: 'rpm-s390x', description: 'RHEL / CentOS (7+) s390x', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel72AndAbove] } ] }, From 0027b144a81b8b0da8f4a69855c2581ff6ef8bde Mon Sep 17 00:00:00 2001 From: Kevin Mas Ruiz Date: Wed, 23 Aug 2023 23:22:25 +0200 Subject: [PATCH 11/11] chore: extract to variables --- config/release-package-matrix.js | 68 ++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 26 deletions(-) diff --git a/config/release-package-matrix.js b/config/release-package-matrix.js index e4c34522df..8523183755 100644 --- a/config/release-package-matrix.js +++ b/config/release-package-matrix.js @@ -8,97 +8,113 @@ const rhel70AndAboveAndRpmBased = ['rhel70', 'rhel71', ...rhel72AndAbove, 'amazo const ubuntu1804AndAboveAndDebBased = ['ubuntu1804', 'ubuntu1804', 'ubuntu2004', 'ubuntu2204', 'debian92', 'debian10', 'debian11', 'debian12'] const allLinux = [...rhel70AndAboveAndRpmBased, ...ubuntu1804AndAboveAndDebBased] +const publicDescriptions = { + darwin_x64: 'MacOS x64 (10.14+)', + darwin_arm64: 'MacOS M1 (11.0+)', + linux_x64: 'Linux x64', + linux_arm64: 'Linux arm64', + debian_x64: 'Debian (10+) / Ubuntu (18.04+) x64', + debian_arm64: 'Debian (10+) / Ubuntu (18.04+) arm64', + rhel_x64: 'RHEL / CentOS (7+) x64', + rhel_arm64: 'RHEL / CentOS (7+) arm64', + linux_ppc64le: 'Linux ppc64le', + rhel_ppc64le: 'RHEL / CentOS (7+) ppc64le', + linux_s390x: 'Linux ppc64le', + rhel_s390x: 'RHEL / CentOS (7+) ppc64le', + win32_x64: 'Windows x64 (8.1+)' +}; + exports.RELEASE_PACKAGE_MATRIX = [ { executableOsId: 'darwin-x64', compileBuildVariant: 'darwin', packages: [ - { name: 'darwin-x64', description: 'MacOS x64 (10.14+)', packageType: 'zip', packageOn: 'darwin', smokeTestKind: 'macos', serverLikeTargetList: ['macos'] } + { name: 'darwin-x64', description: publicDescriptions.darwin_x64, packageType: 'zip', packageOn: 'darwin', smokeTestKind: 'macos', serverLikeTargetList: ['macos'] } ] }, { executableOsId: 'darwin-arm64', compileBuildVariant: 'darwin_arm64', packages: [ - { name: 'darwin-arm64', description: 'MacOS M1 (11.0+)', packageType: 'zip', packageOn: 'darwin', smokeTestKind: 'macos', serverLikeTargetList: ['macos'] } + { name: 'darwin-arm64', description: publicDescriptions.darwin_arm64, packageType: 'zip', packageOn: 'darwin', smokeTestKind: 'macos', serverLikeTargetList: ['macos'] } ] }, { executableOsId: 'linux-x64', compileBuildVariant: 'linux_x64_build', packages: [ - { name: 'linux-x64', description: 'Linux x64', packageType: 'tgz', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...allLinux] }, - { name: 'deb-x64', description: 'Debian (10+) / Ubuntu (18.04+) x64', packageType: 'deb', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'ubuntu22.04-nohome-deb', 'debian9-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-x64', description: 'RHEL / CentOS (7+) x64', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'suse12-rpm', 'suse15-rpm', 'amazonlinux1-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } + { name: 'linux-x64', description: publicDescriptions.linux_x64, packageType: 'tgz', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...allLinux] }, + { name: 'deb-x64', description: publicDescriptions.debian_x64, packageType: 'deb', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'ubuntu22.04-nohome-deb', 'debian9-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-x64', description: publicDescriptions.rhel_x64, packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'suse12-rpm', 'suse15-rpm', 'amazonlinux1-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } ] }, { executableOsId: 'linux-x64-openssl11', compileBuildVariant: 'linux_x64_build_openssl11', packages: [ - { name: 'linux-x64-openssl11', description: 'Linux x64', packageType: 'tgz with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, - { name: 'deb-x64-openssl11', description: 'Debian (10+) / Ubuntu (18.04+) x64', packageType: 'deb with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-x64-openssl11', description: 'RHEL / CentOS (7+) x64', packageType: 'rpm with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-epel-rpm', 'amazonlinux2-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } + { name: 'linux-x64-openssl11', description: publicDescriptions.linux_x64, packageType: 'tgz with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, + { name: 'deb-x64-openssl11', description: publicDescriptions.debian_x64, packageType: 'deb with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-x64-openssl11', description: publicDescriptions.rhel_x64, packageType: 'rpm with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-epel-rpm', 'amazonlinux2-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } ] }, { executableOsId: 'linux-x64-openssl3', compileBuildVariant: 'linux_x64_build_openssl3', packages: [ - { name: 'linux-x64-openssl3', description: 'Linux x64', packageType: 'tgz with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, - { name: 'deb-x64-openssl3', description: 'Debian (10+) / Ubuntu (18.04+) x64', packageType: 'deb with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-x64-openssl3', description: 'RHEL / CentOS (7+) x64', packageType: 'rpm with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } + { name: 'linux-x64-openssl3', description: publicDescriptions.linux_x64, packageType: 'tgz with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...allLinux] }, + { name: 'deb-x64-openssl3', description: publicDescriptions.debian_x64, packageType: 'deb with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-x64-openssl3', description: publicDescriptions.rhel_x64, packageType: 'rpm with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...rhel70AndAboveAndRpmBased] } ] }, { executableOsId: 'linux-arm64', compileBuildVariant: 'linux_arm64_build', packages: [ - { name: 'linux-arm64', packageOn: 'linux_package', description: 'Linux arm64', packageType: 'tgz', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...al2AndAbove] }, - { name: 'deb-arm64', description: 'Debian (10+) / Ubuntu (18.04+) arm64', packageType: 'deb', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-arm64', description: 'RHEL / CentOS (7+) arm64', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } + { name: 'linux-arm64', description: publicDescriptions.linux_arm64, packageType: 'tgz', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'], serverLikeTargetList: [...al2AndAbove] }, + { name: 'deb-arm64', description: publicDescriptions.debian_arm64, packageType: 'deb', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'debian10-deb', 'debian11-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-arm64', description: publicDescriptions.rhel_arm64, packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } ] }, { executableOsId: 'linux-arm64-openssl11', compileBuildVariant: 'linux_arm64_build_openssl11', packages: [ - { name: 'linux-arm64-openssl11', description: 'Linux arm64', packageType: 'tgz with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, - { name: 'deb-arm64-openssl11', description: 'Debian (10+) / Ubuntu (18.04+) arm64', packageType: 'deb with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-arm64-openssl11', description: 'RHEL / CentOS (7+) arm64', packageType: 'rpm with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm'], serverLikeTargetList: [...al2AndAbove] } + { name: 'linux-arm64-openssl11', description: publicDescriptions.linux_arm64, packageType: 'tgz with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, + { name: 'deb-arm64-openssl11', description: publicDescriptions.debian_arm64, packageType: 'deb with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-arm64-openssl11', description: publicDescriptions.rhel_arm64, packageType: 'rpm with shared OpenSSL 1.1', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm'], serverLikeTargetList: [...al2AndAbove] } ] }, { executableOsId: 'linux-arm64-openssl3', compileBuildVariant: 'linux_arm64_build_openssl3', packages: [ - { name: 'linux-arm64-openssl3', description: 'Linux arm64', packageType: 'tgz with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, - { name: 'deb-arm64-openssl3', description: 'Debian (10+) / Ubuntu (18.04+) arm64', packageType: 'deb with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, - { name: 'rpm-arm64-openssl3', description: 'RHEL / CentOS (7+) arm64', packageType: 'rpm with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } + { name: 'linux-arm64-openssl3', description: publicDescriptions.linux_arm64, packageType: 'tgz with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...al2AndAbove] }, + { name: 'deb-arm64-openssl3', description: publicDescriptions.debian_arm64, packageType: 'deb with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb', 'ubuntu22.04-fips-deb', 'debian12-deb'], serverLikeTargetList: [...ubuntu1804AndAboveAndDebBased] }, + { name: 'rpm-arm64-openssl3', description: publicDescriptions.rhel_arm64, packageType: 'rpm with shared OpenSSL 3', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'rocky9-fips-rpm', 'amazonlinux2023-rpm'], serverLikeTargetList: [...al2AndAbove] } ] }, { executableOsId: 'linux-ppc64le', compileBuildVariant: 'linux_ppc64le_build', packages: [ - { name: 'linux-ppc64le', description: 'Linux ppc64le', packageType: 'tgz', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel81AndAbove] }, - { name: 'rpm-ppc64le', description: 'RHEL / CentOS (7+) ppc64le', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel81AndAbove] } + { name: 'linux-ppc64le', description: publicDescriptions.linux_ppc64le, packageType: 'tgz', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel81AndAbove] }, + { name: 'rpm-ppc64le', description: publicDescriptions.rhel_ppc64le, packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel81AndAbove] } ] }, { executableOsId: 'linux-s390x', compileBuildVariant: 'linux_s390x_build', packages: [ - { name: 'linux-s390x', description: 'Linux s390x', packageType: 'tgz', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel72AndAbove] }, - { name: 'rpm-s390x', description: 'RHEL / CentOS (7+) s390x', packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel72AndAbove] } + { name: 'linux-s390x', description: publicDescriptions.linux_s390x, packageType: 'tgz', packageOn: 'linux_package', smokeTestKind: 'none', serverLikeTargetList: [...rhel72AndAbove] }, + { name: 'rpm-s390x', description: publicDescriptions.rhel_s390x, packageType: 'rpm', packageOn: 'linux_package', smokeTestKind: 'rpmextract', serverLikeTargetList: [...rhel72AndAbove] } ] }, { executableOsId: 'win32', compileBuildVariant: 'win32_build', packages: [ - { name: 'win32-x64', description: 'Windows x64 (8.1+)', packageType: 'zip', packageOn: 'win32', smokeTestKind: 'ssh', serverLikeTargetList: ['windows'] }, - { name: 'win32msi-x64', description: 'Windows x64 (8.1+)', packageType: 'msi', packageOn: 'win32', smokeTestKind: 'ssh', serverLikeTargetList: ['windows'] } + { name: 'win32-x64', description: publicDescriptions.win32_x64, packageType: 'zip', packageOn: 'win32', smokeTestKind: 'ssh', serverLikeTargetList: ['windows'] }, + { name: 'win32msi-x64', description: publicDescriptions.win32_x64, packageType: 'msi', packageOn: 'win32', smokeTestKind: 'ssh', serverLikeTargetList: ['windows'] } ] } ];