This is an automated email from the ASF dual-hosted git repository. jiafengzheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/doris-website.git
The following commit(s) were added to refs/heads/master by this push: new c3740aef8ac add 1.1.2 download links (#98) c3740aef8ac is described below commit c3740aef8acddbccdaccf628a9fc0e63170f98d5 Author: song7788q <songp...@gmail.com> AuthorDate: Wed Sep 14 12:34:54 2022 +0800 add 1.1.2 download links (#98) * add 1.1.2 download links --- docusaurus.config.js | 8 +- i18n/zh-CN/code.json | 3 + src/constant/download.data.ts | 238 ++++++++++++++++++++++++++++-------------- src/pages/download/index.scss | 25 ++++- src/pages/download/index.tsx | 35 +++++-- 5 files changed, 214 insertions(+), 95 deletions(-) diff --git a/docusaurus.config.js b/docusaurus.config.js index 47fee481130..d1347130d02 100644 --- a/docusaurus.config.js +++ b/docusaurus.config.js @@ -3,12 +3,10 @@ // @ts-ignore const versions = require('./versions.json'); const lightCodeTheme = require('prism-react-renderer/themes/github'); -const showAllVersions = true; +const showAllVersions = false; const { ssrTemplate } = require('./config/ssrTemplate'); const customDocusaurusPlugin = require('./config/custom-docusaurus-plugin'); -const versionsPlugin = require('./config/versions-plugin') - -console.log(process.env); +const versionsPlugin = require('./config/versions-plugin'); /** @type {import('@docusaurus/types').Config} */ const config = { @@ -56,7 +54,7 @@ const config = { [ '@docusaurus/plugin-pwa', { - debug: true, + debug: false, offlineModeActivationStrategies: ['appInstalled', 'standalone', 'queryString', 'mobile'], injectManifestConfig: { globPatterns: ['**/*.{json,pdf,docx,xlsx,html,css,js,png,svg,ico,jpg,jpeg}'], diff --git a/i18n/zh-CN/code.json b/i18n/zh-CN/code.json index d6c742c8498..034bf8c1237 100644 --- a/i18n/zh-CN/code.json +++ b/i18n/zh-CN/code.json @@ -758,5 +758,8 @@ }, "sitemap.page.subTitle": { "message": "从这里开启您的 Apache Doris 之旅,与 Apache Doris 一起发现无限可能" + }, + "download.quick.download.version.tips": { + "message": "apache-doris-1.1.1-bin-x86-noavx2 版本暂不提供下载,我们会在进行更新。" } } \ No newline at end of file diff --git a/src/constant/download.data.ts b/src/constant/download.data.ts index fd72a9b26ab..6db94efb3ce 100644 --- a/src/constant/download.data.ts +++ b/src/constant/download.data.ts @@ -1,12 +1,15 @@ -export interface DownloadLinkProps { +interface item { label: string; - id: string; links: { source: string; signature: string; sha512: string; }; } +export interface DownloadLinkProps { + id: string; + items: item[]; +} const APACHE_LINK = 'https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename='; const CHINA_MIRROR_LINK = 'https://mirrors.tuna.tsinghua.edu.cn/apache/'; @@ -24,86 +27,161 @@ export function getAllDownloadLinks(locale: string) { const sources = locale.toLocaleUpperCase() === 'EN' ? APACHE_LINK : CHINA_MIRROR_LINK; return [ { - label: 'apache-doris-1.1.1-bin-x64.tar.gz', + id: '1.1.2-intel-avx2-jdk8', + items: [ + { + label: 'apache-doris-fe-1.1.2-bin.tar.gz', + links: { + source: `${sources}doris/1.1/1.1.2-rc05/apache-doris-fe-1.1.2-bin.tar.gz`, + signature: `${APACHE_LINK}doris/1.1/1.1.2-rc05/apache-doris-fe-1.1.2-bin.tar.gz.asc`, + sha512: `${APACHE_LINK}doris/1.1/1.1.2-rc05/apache-doris-fe-1.1.2-bin.tar.gz.sha512`, + }, + }, + { + label: 'apache-doris-be-1.1.2-bin-x86_64.tar.gz', + links: { + source: `${sources}doris/1.1/1.1.2-rc05/apache-doris-be-1.1.2-bin-x86_64.tar.gz`, + signature: `${APACHE_LINK}doris/1.1/1.1.2-rc05/apache-doris-be-1.1.2-bin-x86_64.tar.gz.asc`, + sha512: `${APACHE_LINK}doris/1.1/1.1.2-rc05/apache-doris-be-1.1.2-bin-x86_64.tar.gz.sha512`, + }, + }, + ], + }, + { + id: '1.1.2-intel-noavx2-jdk8', + items: [ + { + label: 'apache-doris-fe-1.1.2-bin.tar.gz', + links: { + source: `${sources}doris/1.1/1.1.2-rc05/apache-doris-fe-1.1.2-bin.tar.gz`, + signature: `${APACHE_LINK}doris/1.1/1.1.2-rc05/apache-doris-fe-1.1.2-bin.tar.gz.asc`, + sha512: `${APACHE_LINK}doris/1.1/1.1.2-rc05/apache-doris-fe-1.1.2-bin.tar.gz.sha512`, + }, + }, + { + label: 'apache-doris-be-1.1.2-bin-x86_64-noavx2.tar.gz', + links: { + source: `${sources}doris/1.1/1.1.2-rc05/apache-doris-be-1.1.2-bin-x86_64-noavx2.tar.gz`, + signature: `${APACHE_LINK}doris/1.1/1.1.2-rc05/apache-doris-be-1.1.2-bin-x86_64-noavx2.tar.gz.asc`, + sha512: `${APACHE_LINK}doris/1.1/1.1.2-rc05/apache-doris-be-1.1.2-bin-x86_64-noavx2.tar.gz.sha512`, + }, + }, + ], + }, + { + id: '1.1.2-arm-jdk8', + items: [ + { + label: 'apache-doris-fe-1.1.2-bin.tar.gz', + links: { + source: `${sources}doris/1.1/1.1.2-rc05/apache-doris-fe-1.1.2-bin.tar.gz`, + signature: `${APACHE_LINK}doris/1.1/1.1.2-rc05/apache-doris-fe-1.1.2-bin.tar.gz.asc`, + sha512: `${APACHE_LINK}doris/1.1/1.1.2-rc05/apache-doris-fe-1.1.2-bin.tar.gz.sha512`, + }, + }, + { + label: 'apache-doris-be-1.1.2-bin-arm.tar.gz', + links: { + source: `${sources}doris/1.1/1.1.2-rc05/apache-doris-be-1.1.2-bin-arm.tar.gz`, + signature: `${APACHE_LINK}doris/1.1/1.1.2-rc05/apache-doris-be-1.1.2-bin-arm.tar.gz.asc`, + sha512: `${APACHE_LINK}doris/1.1/1.1.2-rc05/apache-doris-be-1.1.2-bin-arm.tar.gz.sha512`, + }, + }, + ], + }, + { id: '1.1.1-intel-avx2-jdk8', - links: { - source: `${sources}doris/1.1/1.1.1-rc03/apache-doris-1.1.1-bin-x86.tar.gz`, - signature: `${APACHE_LINK}doris/1.1/1.1.1-rc03/apache-doris-1.1.1-bin-x86.tar.gz.asc`, - sha512: `${APACHE_LINK}doris/1.1/1.1.1-rc03/apache-doris-1.1.1-bin-x86.tar.gz.sha512`, - }, + items: [ + { + label: 'apache-doris-1.1.1-bin-x64.tar.gz', + links: { + source: `${sources}doris/1.1/1.1.1-rc03/apache-doris-1.1.1-bin-x86.tar.gz`, + signature: `${APACHE_LINK}doris/1.1/1.1.1-rc03/apache-doris-1.1.1-bin-x86.tar.gz.asc`, + sha512: `${APACHE_LINK}doris/1.1/1.1.1-rc03/apache-doris-1.1.1-bin-x86.tar.gz.sha512`, + }, + }, + ], }, { - label: 'apache-doris-1.1.1-bin-x64-noavx2.tar.gz', id: '1.1.1-intel-noavx2-jdk8', - links: { - source: `${sources}doris/1.1/1.1.1-rc03/apache-doris-1.1.1-bin-x86-noavx2.tar.gz`, - signature: `${APACHE_LINK}doris/1.1/1.1.1-rc03/apache-doris-1.1.1-bin-x86-noavx2.tar.gz.asc`, - sha512: `${APACHE_LINK}doris/1.1/1.1.1-rc03/apache-doris-1.1.1-bin-x86-noavx2.tar.gz.sha512`, - }, + items: [ + { + label: 'apache-doris-1.1.1-bin-x64-noavx2.tar.gz', + links: { + source: `${sources}doris/1.1/1.1.1-rc03/apache-doris-1.1.1-bin-x86-noavx2.tar.gz`, + signature: `${APACHE_LINK}doris/1.1/1.1.1-rc03/apache-doris-1.1.1-bin-x86-noavx2.tar.gz.asc`, + sha512: `${APACHE_LINK}doris/1.1/1.1.1-rc03/apache-doris-1.1.1-bin-x86-noavx2.tar.gz.sha512`, + }, + }, + ], }, { - label: 'apache-doris-1.1.1-bin-arm64.tar.gz', id: '1.1.1-arm-jdk8', - links: { - source: `${sources}doris/1.1/1.1.1-rc03/apache-doris-1.1.1-bin-arm.tar.gz`, - signature: `${APACHE_LINK}doris/1.1/1.1.1-rc03/apache-doris-1.1.1-bin-arm.tar.gz.asc`, - sha512: `${APACHE_LINK}doris/1.1/1.1.1-rc03/apache-doris-1.1.1-bin-arm.tar.gz.sha512`, - }, - }, - { - label: 'apache-doris-1.1.0-bin-x64-jdk8.tar.gz', - id: '1.1.0-intel-avx2-jdk8', - links: { - source: `${sources}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-jdk8.tar.gz`, - signature: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-jdk8.tar.gz.asc`, - sha512: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-jdk8.tar.gz.sha512`, - }, - }, - { - label: 'apache-doris-1.1.0-bin-x64-jdk11.tar.gz', - id: '1.1.0-intel-avx2-jdk11', - links: { - source: `${sources}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-jdk11.tar.gz`, - signature: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-jdk11.tar.gz.asc`, - sha512: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-jdk11.tar.gz.sha512`, - }, - }, - { - label: 'apache-doris-1.1.0-bin-x64-noavx2-jdk8.tar.gz', - id: '1.1.0-intel-noavx2-jdk8', - links: { - source: `${sources}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-noavx2-jdk8.tar.gz`, - signature: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-noavx2-jdk8.tar.gz.asc`, - sha512: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-noavx2-jdk8.tar.gz.sha512`, - }, - }, - { - label: 'apache-doris-1.1.0-bin-x64-noavx2-jdk11.tar.gz', - id: '1.1.0-intel-noavx2-jdk11', - links: { - source: `${sources}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-noavx2-jdk11.tar.gz`, - signature: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-noavx2-jdk11.tar.gz.asc`, - sha512: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-noavx2-jdk11.tar.gz.sha512`, - }, - }, - { - label: 'apache-doris-1.1.0-bin-arm64-jdk8.tar.gz', - id: '1.1.0-arm-jdk8', - links: { - source: `${sources}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-arm-jdk8.tar.gz`, - signature: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-arm-jdk8.tar.gz.asc`, - sha512: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-arm-jdk8.tar.gz.sha512`, - }, - }, - { - label: 'apache-doris-1.1.0-bin-arm64-jdk11.tar.gz', - id: '1.1.0-arm-jdk11', - links: { - source: `${sources}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-arm-jdk11.tar.gz`, - signature: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-arm-jdk11.tar.gz.asc`, - sha512: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-arm-jdk11.tar.gz.sha512`, - }, + items: [ + { + label: 'apache-doris-1.1.1-bin-arm64.tar.gz', + links: { + source: `${sources}doris/1.1/1.1.1-rc03/apache-doris-1.1.1-bin-arm.tar.gz`, + signature: `${APACHE_LINK}doris/1.1/1.1.1-rc03/apache-doris-1.1.1-bin-arm.tar.gz.asc`, + sha512: `${APACHE_LINK}doris/1.1/1.1.1-rc03/apache-doris-1.1.1-bin-arm.tar.gz.sha512`, + }, + }, + ], }, + // { + // label: 'apache-doris-1.1.0-bin-x64-jdk8.tar.gz', + // id: '1.1.0-intel-avx2-jdk8', + // links: { + // source: `${sources}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-jdk8.tar.gz`, + // signature: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-jdk8.tar.gz.asc`, + // sha512: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-jdk8.tar.gz.sha512`, + // }, + // }, + // { + // label: 'apache-doris-1.1.0-bin-x64-jdk11.tar.gz', + // id: '1.1.0-intel-avx2-jdk11', + // links: { + // source: `${sources}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-jdk11.tar.gz`, + // signature: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-jdk11.tar.gz.asc`, + // sha512: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-jdk11.tar.gz.sha512`, + // }, + // }, + // { + // label: 'apache-doris-1.1.0-bin-x64-noavx2-jdk8.tar.gz', + // id: '1.1.0-intel-noavx2-jdk8', + // links: { + // source: `${sources}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-noavx2-jdk8.tar.gz`, + // signature: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-noavx2-jdk8.tar.gz.asc`, + // sha512: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-noavx2-jdk8.tar.gz.sha512`, + // }, + // }, + // { + // label: 'apache-doris-1.1.0-bin-x64-noavx2-jdk11.tar.gz', + // id: '1.1.0-intel-noavx2-jdk11', + // links: { + // source: `${sources}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-noavx2-jdk11.tar.gz`, + // signature: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-noavx2-jdk11.tar.gz.asc`, + // sha512: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-x86-noavx2-jdk11.tar.gz.sha512`, + // }, + // }, + // { + // label: 'apache-doris-1.1.0-bin-arm64-jdk8.tar.gz', + // id: '1.1.0-arm-jdk8', + // links: { + // source: `${sources}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-arm-jdk8.tar.gz`, + // signature: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-arm-jdk8.tar.gz.asc`, + // sha512: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-arm-jdk8.tar.gz.sha512`, + // }, + // }, + // { + // label: 'apache-doris-1.1.0-bin-arm64-jdk11.tar.gz', + // id: '1.1.0-arm-jdk11', + // links: { + // source: `${sources}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-arm-jdk11.tar.gz`, + // signature: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-arm-jdk11.tar.gz.asc`, + // sha512: `${APACHE_LINK}doris/1.1/1.1.0-rc05/apache-doris-1.1.0-bin-arm-jdk11.tar.gz.sha512`, + // }, + // }, ]; } @@ -167,7 +245,13 @@ export function getAllRelease(locale: string) { const sources = locale.toLocaleUpperCase() === 'EN' ? ALL_RELEASE_LINK : CHINA_ALL_RELEASE_MIRROR_LINK; return [ { - version: '1.1.1 ( latest )', + version: '1.1.2 ( latest )', + date: '2022-09-13', + note: '/docs/releasenotes/release-1.1.2', + download: `${sources}doris/1.1/1.1.2-rc05/`, + }, + { + version: '1.1.1', date: '2022-07-29', note: '/docs/releasenotes/release-1.1.1', download: `${sources}doris/1.1/1.1.1-rc03/`, @@ -200,8 +284,8 @@ export function getAllRelease(locale: string) { } export enum VersionEnum { - Latest = '1.1.1', - Prev = '1.1.0', + Latest = '1.1.2', + Prev = '1.1.1', } export enum CPUEnum { diff --git a/src/pages/download/index.scss b/src/pages/download/index.scss index 2fef49bb55d..42f3bd944ea 100644 --- a/src/pages/download/index.scss +++ b/src/pages/download/index.scss @@ -56,6 +56,7 @@ color: var(--global-colors-text-primary); min-height: 3.125rem; display: flex; + flex-direction: column; align-items: center; justify-content: center; cursor: pointer; @@ -75,12 +76,20 @@ &+.radio { margin-left: -1px; } + & + .disabled{ + border-left: none; + margin-left: 0; + } .inner { - margin: 0.3125rem 0.625rem; + margin: 0.3125rem; background-color: #F7FAFF; - width: 100%; + width: calc(100% - 0.625rem); color: var(--ifm-color-primary); + + & + .inner{ + margin-top: 0; + } } } } @@ -99,6 +108,18 @@ padding: 0.125rem 0.3125rem; margin: 0 0.3125rem; } + + &.tips{ + margin-top: 0.625rem; + position: relative; + padding-left: 0.625rem; + &::after{ + content: '*'; + position: absolute; + left: 0; + top: 0.1875rem; + } + } } } diff --git a/src/pages/download/index.tsx b/src/pages/download/index.tsx index fa84b03aa45..b9b6e2d7563 100644 --- a/src/pages/download/index.tsx +++ b/src/pages/download/index.tsx @@ -20,8 +20,8 @@ import { } from '@site/src/constant/download.data'; const BINARY_VERSION = [ - { label: '1.1.1 ( latest )', value: VersionEnum.Latest }, - { label: '1.1.0', value: VersionEnum.Prev }, + { label: '1.1.2 ( latest )', value: VersionEnum.Latest }, + { label: '1.1.1', value: VersionEnum.Prev }, ]; const CPU = [ { label: 'X64 ( avx2 )', value: CPUEnum.IntelAvx2 }, @@ -52,10 +52,12 @@ export default function Download(): JSX.Element { setVersion(val); }; const changeCPU = (val: string) => { + if (version === VersionEnum.Latest && val === CPUEnum.IntelNoAvx2) return; setCPU(val); }; const changeJDK = (val: string) => { - if (version === VersionEnum.Latest && val !== JDKEnum.JDK8) return; + // if (version === VersionEnum.Latest && val !== JDKEnum.JDK8) return; + if (val !== JDKEnum.JDK8) return; setJDK(val); }; @@ -123,6 +125,8 @@ export default function Download(): JSX.Element { <div className={clsx('radio', { checked: cpu === item.value, + disabled: + version === VersionEnum.Latest && item.value === CPUEnum.IntelNoAvx2, })} key={item.value} onClick={() => changeCPU(item.value)} @@ -143,7 +147,8 @@ export default function Download(): JSX.Element { <div className={clsx('radio', { checked: jdk === item.value, - disabled: version === VersionEnum.Latest && item.value !== JDKEnum.JDK8, + // disabled: version === VersionEnum.Latest && item.value !== JDKEnum.JDK8, + disabled: item.value !== JDKEnum.JDK8, })} key={item.value} onClick={() => changeJDK(item.value)} @@ -161,13 +166,15 @@ export default function Download(): JSX.Element { </label> <div className="tabs-radio"> <div className="radio"> - <div className="inner"> - <Link to={current?.links.source}>{current?.label}</Link> - <span> ( </span> - <Link to={current?.links.signature}>asc</Link>,{' '} - <Link to={current?.links.sha512}>sha512</Link> - <span> )</span> - </div> + {current?.items.map(item => ( + <div className="inner" key={item.label}> + <Link to={item?.links.source}>{item?.label}</Link> + <span> ( </span> + <Link to={item?.links.signature}>asc</Link>,{' '} + <Link to={item?.links.sha512}>sha512</Link> + <span> )</span> + </div> + ))} </div> </div> </div> @@ -182,6 +189,12 @@ export default function Download(): JSX.Element { as bloom filter. </Translate> </div> + <div className="intr tips"> + <Translate id="download.quick.download.version.tips"> + The apache-doris-1.1.1-bin-x86-noavx2 version is not currently available for download, + we will update it soon. + </Translate> + </div> </div> </PageColumn> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org