Merge pull request #25802 from ClickHouse/add-links-to-builds-on-the-front-page

Add links to builds on the front page

docs/_includes/install/freebsd.sh

@@ -0,0 +1,3 @@
+wget 'https://builds.clickhouse.tech/master/freebsd/clickhouse'
+chmod a+x ./clickhouse
+sudo ./clickhouse install

docs/_includes/install/mac-arm.sh

@@ -0,0 +1,3 @@
+wget 'https://builds.clickhouse.tech/master/macos-aarch64/clickhouse'
+chmod a+x ./clickhouse
+./clickhouse

docs/_includes/install/mac-x86.sh

@@ -0,0 +1,3 @@
+wget 'https://builds.clickhouse.tech/master/macos/clickhouse'
+chmod a+x ./clickhouse
+./clickhouse

docs/en/getting-started/install.md

@@ -107,9 +107,10 @@ sudo ./clickhouse install
 
 For non-Linux operating systems and for AArch64 CPU arhitecture, ClickHouse builds are provided as a cross-compiled binary from the latest commit of the `master` branch (with a few hours delay).
 
--   [macOS](https://builds.clickhouse.tech/master/macos/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/macos/clickhouse' && chmod a+x ./clickhouse`
+-   [MacOS x86_64](https://builds.clickhouse.tech/master/macos/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/macos/clickhouse' && chmod a+x ./clickhouse`
--   [FreeBSD](https://builds.clickhouse.tech/master/freebsd/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/freebsd/clickhouse' && chmod a+x ./clickhouse`
+-   [MacOS Aarch64 (Apple Silicon)](https://builds.clickhouse.tech/master/macos-aarch64/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/macos-aarch64/clickhouse' && chmod a+x ./clickhouse`
--   [AArch64](https://builds.clickhouse.tech/master/aarch64/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/aarch64/clickhouse' && chmod a+x ./clickhouse`
+-   [FreeBSD x86_64](https://builds.clickhouse.tech/master/freebsd/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/freebsd/clickhouse' && chmod a+x ./clickhouse`
+-   [Linux AArch64](https://builds.clickhouse.tech/master/aarch64/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/aarch64/clickhouse' && chmod a+x ./clickhouse`
 
 After downloading, you can use the `clickhouse client` to connect to the server, or `clickhouse local` to process local data.
 

docs/tools/build.py

@@ -154,9 +154,6 @@ def build(args):
     if not args.skip_website:
         website.build_website(args)
 
-    if not args.skip_test_templates:
-        test.test_templates(args.website_dir)
-
     if not args.skip_docs:
         generate_cmake_flags_files()
 
@@ -197,7 +194,6 @@ if __name__ == '__main__':
     arg_parser.add_argument('--skip-blog', action='store_true')
     arg_parser.add_argument('--skip-git-log', action='store_true')
     arg_parser.add_argument('--skip-docs', action='store_true')
-    arg_parser.add_argument('--skip-test-templates', action='store_true')
     arg_parser.add_argument('--test-only', action='store_true')
     arg_parser.add_argument('--minify', action='store_true')
     arg_parser.add_argument('--htmlproofer', action='store_true')

docs/tools/test.py

@@ -7,36 +7,6 @@ import bs4
 import subprocess
 
 
-def test_template(template_path):
-    if template_path.endswith('amp.html'):
-        # Inline CSS/JS is ok for AMP pages
-        return
-
-    logging.debug(f'Running tests for {template_path} template')
-    with open(template_path, 'r') as f:
-        soup = bs4.BeautifulSoup(
-            f,
-            features='html.parser'
-        )
-        for tag in soup.find_all():
-            style_attr = tag.attrs.get('style')
-            assert not style_attr, f'Inline CSS is prohibited, found {style_attr} in {template_path}'
-
-            if tag.name == 'script':
-                if tag.attrs.get('type') == 'application/ld+json':
-                    continue
-                for content in tag.contents:
-                    assert not content, f'Inline JavaScript is prohibited, found "{content}" in {template_path}'
-
-
-def test_templates(base_dir):
-    logging.info('Running tests for templates')
-    for root, _, filenames in os.walk(base_dir):
-        for filename in filenames:
-            if filename.endswith('.html'):
-                test_template(os.path.join(root, filename))
-
-
 def test_single_page(input_path, lang):
     with open(input_path) as f:
         soup = bs4.BeautifulSoup(

website/README.md

@@ -12,7 +12,7 @@ sudo npm install -g purify-css amphtml-validator
 sudo apt install wkhtmltopdf
 virtualenv build
 
-./build.py --skip-multi-page --skip-single-page --skip-amp --skip-pdf --skip-blog --skip-git-log --skip-docs --skip-test-templates --livereload 8080
+./build.py --skip-multi-page --skip-single-page --skip-amp --skip-pdf --skip-blog --skip-git-log --skip-docs --livereload 8080
 
 # Open the web browser and go to http://localhost:8080/
 ```
@@ -20,11 +20,11 @@ virtualenv build
 # How to quickly test the blog
 
 ```
-./build.py --skip-multi-page --skip-single-page --skip-amp --skip-pdf --skip-git-log --skip-docs --skip-test-templates --livereload 8080
+./build.py --skip-multi-page --skip-single-page --skip-amp --skip-pdf --skip-git-log --skip-docs --livereload 8080
 ```
 
 # How to quickly test the ugly annoying broken links in docs
 
 ```
-./build.py --skip-multi-page --skip-amp --skip-pdf --skip-blog --skip-git-log --skip-test-templates --lang en --livereload 8080
+./build.py --skip-multi-page --skip-amp --skip-pdf --skip-blog --skip-git-log --lang en --livereload 8080
 ```

website/templates/index/quickstart.html

@@ -2,9 +2,7 @@
     <div class="container lead">
     <h2 id="quick-start" class="display-4 mt-5">Quick start</h2>
 
-    <p>System requirements for pre-built packages: Linux, x86_64 with SSE 4.2.</p>
+    <ul class="nav nav-tabs mt-1 small" id="install-tab" role="tablist">
-
-    <ul class="nav nav-tabs" id="install-tab" role="tablist">
         <li class="nav-item">
             <a class="nav-link active" id="deb-tab" data-toggle="tab" href="#deb" role="tab" aria-controls="deb" aria-selected="true" title="deb packages">Ubuntu or Debian</a>
         </li>
@@ -14,6 +12,15 @@
         <li class="nav-item">
             <a class="nav-link" id="tgz-tab" data-toggle="tab" href="#tgz" role="tab" aria-controls="tgz" aria-selected="false" title="tgz packages">Other Linux</a>
         </li>
+        <li class="nav-item">
+            <a class="nav-link" id="mac-x86-tab" data-toggle="tab" href="#mac-x86" role="tab" aria-controls="mac-x86" aria-selected="false" title="Mac x86 packages">Mac (x86)</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link" id="mac-arm-tab" data-toggle="tab" href="#mac-arm" role="tab" aria-controls="mac-arm" aria-selected="false" title="Mac ARM packages">Mac (ARM)</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link" id="freebsd-tab" data-toggle="tab" href="#freebsd" role="tab" aria-controls="freebsd" aria-selected="false" title="FreeBSD packages">FreeBSD</a>
+        </li>
         <li class="nav-item">
             <a class="nav-link" href="/docs/en/commercial/cloud/" role="tab" aria-controls="cloud" aria-selected="false" title="Cloud Service Providers"><strong>Cloud</strong></a>
         </li>
@@ -29,6 +36,15 @@
         <div class="tab-pane syntax p-3 my-3" id="tgz" role="tabpanel" aria-labelledby="tgz-tab">
             <pre>{% include "install/tgz.sh" %}</pre>
         </div>
+        <div class="tab-pane syntax p-3 my-3" id="mac-x86" role="tabpanel" aria-labelledby="mac-x86-tab">
+            <pre>{% include "install/mac-x86.sh" %}</pre>
+        </div>
+        <div class="tab-pane syntax p-3 my-3" id="mac-arm" role="tabpanel" aria-labelledby="mac-arm-tab">
+            <pre>{% include "install/mac-arm.sh" %}</pre>
+        </div>
+        <div class="tab-pane syntax p-3 my-3" id="freebsd" role="tabpanel" aria-labelledby="freebsd-tab">
+            <pre>{% include "install/freebsd.sh" %}</pre>
+        </div>
     </div>
 
     <p>For other operating systems the easiest way to get started is using