From 56a9b0855699be33ab85af981d38402a5cfde8e7 Mon Sep 17 00:00:00 2001 From: Codingendless Date: Fri, 17 Feb 2023 17:15:21 +0800 Subject: [PATCH 1/8] fix(doc): fix some broken links --- README-zh.md | 6 +++--- README.md | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README-zh.md b/README-zh.md index 73bfc30d..aaf49e6c 100644 --- a/README-zh.md +++ b/README-zh.md @@ -10,7 +10,7 @@ - + @@ -19,14 +19,14 @@ - +

中文 | [English](https://github.com/crawlab-team/crawlab) -[安装](#安装) | [运行](#运行) | [截图](#截图) | [架构](#架构) | [集成](#与其他框架的集成) | [比较](#与其他框架比较) | [相关文章](#相关文章) | [社区&赞助](#社区--赞助) | [更新日志](https://github.com/crawlab-team/crawlab/blob/master/CHANGELOG-zh.md) | [免责声明](https://github.com/crawlab-team/crawlab/blob/master/DISCLAIMER-zh.md) +[安装](#安装) | [运行](#运行) | [截图](#截图) | [架构](#架构) | [集成](#与其他框架的集成) | [比较](#与其他框架比较) | [相关文章](#相关文章) | [社区&赞助](#社区--赞助) | [更新日志](https://github.com/crawlab-team/crawlab/blob/main/CHANGELOG-zh.md) | [免责声明](https://github.com/crawlab-team/crawlab/blob/main/DISCLAIMER-zh.md) 基于Golang的分布式爬虫管理平台，支持Python、NodeJS、Go、Java、PHP等多种编程语言以及多种爬虫框架。 diff --git a/README.md b/README.md index 5c455dc4..1f506c14 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

- + @@ -10,7 +10,7 @@ - + @@ -19,14 +19,14 @@ - +

-[中文](https://github.com/crawlab-team/crawlab/blob/master/README-zh.md) | English +[中文](https://github.com/crawlab-team/crawlab/blob/main/README-zh.md) | English -[Installation](#installation) | [Run](#run) | [Screenshot](#screenshot) | [Architecture](#architecture) | [Integration](#integration-with-other-frameworks) | [Compare](#comparison-with-other-frameworks) | [Community & Sponsorship](#community--sponsorship) | [CHANGELOG](https://github.com/crawlab-team/crawlab/blob/master/CHANGELOG.md) | [Disclaimer](https://github.com/crawlab-team/crawlab/blob/master/DISCLAIMER.md) +[Installation](#installation) | [Run](#run) | [Screenshot](#screenshot) | [Architecture](#architecture) | [Integration](#integration-with-other-frameworks) | [Compare](#comparison-with-other-frameworks) | [Community & Sponsorship](#community--sponsorship) | [CHANGELOG](https://github.com/crawlab-team/crawlab/blob/main/CHANGELOG.md) | [Disclaimer](https://github.com/crawlab-team/crawlab/blob/main/DISCLAIMER.md) Golang-based distributed web crawler management platform, supporting various languages including Python, NodeJS, Go, Java, PHP and various web crawler frameworks including Scrapy, Puppeteer, Selenium. From b79beb2c3bf74c9e858b45d5211edf6f3b8399a3 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Thu, 23 Mar 2023 12:50:10 +0800 Subject: [PATCH 2/8] Update README.md --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1f506c14..667f2974 100644 --- a/README.md +++ b/README.md @@ -257,11 +257,14 @@ Crawlab is easy to use, general enough to adapt spiders in any language and any -## Community & Sponsorship +## Supported by Jetbrains -If you feel Crawlab could benefit your daily work or your company, please add the author's Wechat account noting "Crawlab" to enter the discussion group. Or you scan the Alipay QR code below to give us a reward to upgrade our teamwork software or buy a coffee. +![JetBrains Logo (Main) logo](https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png) + +## Community + +If you feel Crawlab could benefit your daily work or your company, please add the author's Wechat account noting "Crawlab" to enter the discussion group.

-

From 074273c8c1d0b1b36ad888793445c55405b2aa94 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Thu, 23 Mar 2023 12:51:14 +0800 Subject: [PATCH 3/8] Update README.md --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 667f2974..06fcf442 100644 --- a/README.md +++ b/README.md @@ -257,9 +257,11 @@ Crawlab is easy to use, general enough to adapt spiders in any language and any -## Supported by Jetbrains +## Supported by JetBrains -![JetBrains Logo (Main) logo](https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png) +

+ +

## Community From a18ffd367c389fbe19db87ded82e06e1ce3c539f Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Thu, 23 Mar 2023 12:54:38 +0800 Subject: [PATCH 4/8] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 06fcf442..63ab5d15 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Crawlab

- - + + @@ -30,7 +30,7 @@ Golang-based distributed web crawler management platform, supporting various languages including Python, NodeJS, Go, Java, PHP and various web crawler frameworks including Scrapy, Puppeteer, Selenium. -[Demo](https://demo-pro.crawlab.cn) | [Documentation](https://docs.crawlab.cn/en/) +[Demo](https://demo.crawlab.cn) | [Documentation](https://docs.crawlab.cn/en/) ## Installation From 8ef86b15b202a6c07d0a19c2a1e5f9f1421745fb Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Thu, 23 Mar 2023 12:55:18 +0800 Subject: [PATCH 5/8] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 63ab5d15..014b2b50 100644 --- a/README.md +++ b/README.md @@ -260,7 +260,9 @@ Crawlab is easy to use, general enough to adapt spiders in any language and any ## Supported by JetBrains

+ +

## Community From a14322001e18c2f87a03bea674edda1915d41c98 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Thu, 23 Mar 2023 13:06:07 +0800 Subject: [PATCH 6/8] Update docker-crawlab.yml --- .github/workflows/docker-crawlab.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-crawlab.yml b/.github/workflows/docker-crawlab.yml index fb3fb60e..f447a764 100644 --- a/.github/workflows/docker-crawlab.yml +++ b/.github/workflows/docker-crawlab.yml @@ -54,6 +54,12 @@ jobs: done # set outputs + if [[ "${{ github.ref }}" == "refs/tags/"* ]]; then + is_matched_backend=1 + is_matched_frontend=1 + is_matched_dockerfile=1 + fi + echo "::set-output name=is_matched_backend::$is_matched_backend" echo "::set-output name=is_matched_frontend::$is_matched_frontend" echo "::set-output name=is_matched_dockerfile::$is_matched_dockerfile" @@ -62,6 +68,7 @@ jobs: echo "is_matched_backend=$is_matched_backend, file_backend=$file_backend" echo "is_matched_frontend=$is_matched_frontend, file_frontend=$file_frontend" echo "is_matched_dockerfile=$is_matched_dockerfile, file_dockerfile=$file_dockerfile" + - id: version name: Get version run: | @@ -75,7 +82,7 @@ jobs: [ "$VERSION" == "main" ] && VERSION=latest echo "::set-output name=version::$VERSION" - + build-backend: needs: [ setup ] if: needs.setup.outputs.is_matched_backend == '1' From dcdd56c13094bc2d9c5cf0b9a4164dcb2994ca5d Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Thu, 23 Mar 2023 13:10:33 +0800 Subject: [PATCH 7/8] Update README-zh.md --- README-zh.md | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/README-zh.md b/README-zh.md index aaf49e6c..60363250 100644 --- a/README-zh.md +++ b/README-zh.md @@ -1,8 +1,8 @@ # Crawlab

- - + + @@ -30,7 +30,7 @@ 基于Golang的分布式爬虫管理平台，支持Python、NodeJS、Go、Java、PHP等多种编程语言以及多种爬虫框架。 -[查看演示 Demo](https://demo-pro.crawlab.cn) | [文档](https://docs.crawlab.cn/zh/) +[查看演示 Demo](https://demo.crawlab.cn) | [文档](https://docs.crawlab.cn/zh/) ## 安装 @@ -257,11 +257,18 @@ Crawlab使用起来很方便，也很通用，可以适用于几乎任何主流 -## 社区 & 赞助 +## JetBrains 支持 -如果您觉得Crawlab对您的日常开发或公司有帮助，请加作者微信 tikazyq1 并注明"Crawlab"，作者会将你拉入群。或者，您可以扫下方支付宝二维码给作者打赏去升级团队协作软件或买一杯咖啡。 +

+ + + +

+ +## 社区 + +如果您觉得Crawlab对您的日常开发或公司有帮助，请加作者微信 tikazyq1 并注明"Crawlab"，作者会将你拉入群。

-

From a2fad6d81e7388c0029e47e0040c6c4a9889bc69 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sun, 2 Jul 2023 16:28:40 +0800 Subject: [PATCH 8/8] Update README.md --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 014b2b50..bbd11ea8 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,6 @@ - - -