summaryrefslogtreecommitdiffstats
path: root/docs/content
diff options
context:
space:
mode:
authorsilverwind <me@silverwind.io>2019-12-08 17:56:59 +0100
committerLauris BH <lauris@nix.lv>2019-12-08 18:56:59 +0200
commit3f42934b9a9db0a2cd9bb7142997fc9b8dae37a6 (patch)
treec7635e1ff4bbe7efa564d78153db2da594f66f1f /docs/content
parent95a57394af4a1eec7105e5d58fa90c946c6d4089 (diff)
downloadgitea-3f42934b9a9db0a2cd9bb7142997fc9b8dae37a6.tar.gz
gitea-3f42934b9a9db0a2cd9bb7142997fc9b8dae37a6.zip
Remove explicit 'generate' calls, fix release task (#9288)
* Remove more explicit 'generate' calls `generate` is now implicit during `build` since #9114, it is no longer necessary or desired to specify it explicitely. * add js,css,generate dependencies to release task * remove generate warning as per @lunny
Diffstat (limited to 'docs/content')
-rw-r--r--docs/content/doc/installation/from-source.en-us.md2
-rw-r--r--docs/content/doc/installation/from-source.fr-fr.md4
-rw-r--r--docs/content/doc/installation/from-source.zh-cn.md2
-rw-r--r--docs/content/doc/installation/from-source.zh-tw.md4
4 files changed, 4 insertions, 8 deletions
diff --git a/docs/content/doc/installation/from-source.en-us.md b/docs/content/doc/installation/from-source.en-us.md
index 270085e9e8..f5e12182a3 100644
--- a/docs/content/doc/installation/from-source.en-us.md
+++ b/docs/content/doc/installation/from-source.en-us.md
@@ -106,8 +106,6 @@ To include assets, add the `bindata` tag:
TAGS="bindata" make build
```
-WARNING: `generate` method is deprecated and using it may cause build to miss some static files.
-
In the default release build of our continuous integration system, the build
tags are: `TAGS="bindata sqlite sqlite_unlock_notify"`. The simplest
recommended way to build from source is therefore:
diff --git a/docs/content/doc/installation/from-source.fr-fr.md b/docs/content/doc/installation/from-source.fr-fr.md
index def4c4ee41..d4abe0700c 100644
--- a/docs/content/doc/installation/from-source.fr-fr.md
+++ b/docs/content/doc/installation/from-source.fr-fr.md
@@ -60,10 +60,10 @@ Comme nous regroupons déjà toutes les bibliothèques requises pour compiler Gi
* `sqlite sqlite_unlock_notify`: Active la prise en charge d'une base de données [SQLite3](https://sqlite.org/), ceci n'est recommandé que pour les petites installations de Gitea.
* `pam`: Active la prise en charge de PAM (mLinux Pluggable Authentication Modules), très utile si vos utilisateurs doivent être authentifiés avec les comptes du système.
-Il est temps de compiler le binaire, nous suggérons d'intégrer les ressources avec l'option de compilation `bindata`. Pour inclure les ressources, vous devrez également exécuter la tâche Make `generate`. Dans le cas échéant, les ressources ne pourront pas être intégrées:
+Il est temps de compiler le binaire, nous suggérons d'intégrer les ressources avec l'option de compilation `bindata`:
```
-TAGS="bindata" make generate build
+TAGS="bindata" make build
```
## Test
diff --git a/docs/content/doc/installation/from-source.zh-cn.md b/docs/content/doc/installation/from-source.zh-cn.md
index 4b9d1a5182..b9b5be2b5f 100644
--- a/docs/content/doc/installation/from-source.zh-cn.md
+++ b/docs/content/doc/installation/from-source.zh-cn.md
@@ -66,8 +66,6 @@ git checkout v{{< version >}}
TAGS="bindata" make build
```
-警告: `generate` 已经废弃,使用 `generate` 会导致资源文件打包失败。
-
默认的发布版本中的编译选项是: `TAGS="bindata sqlite sqlite_unlock_notify"`。以下为推荐的编译方式:
```bash
diff --git a/docs/content/doc/installation/from-source.zh-tw.md b/docs/content/doc/installation/from-source.zh-tw.md
index 461e9f0748..a7c1a343e0 100644
--- a/docs/content/doc/installation/from-source.zh-tw.md
+++ b/docs/content/doc/installation/from-source.zh-tw.md
@@ -50,10 +50,10 @@ git checkout v{{< version >}}
* `sqlite sqlite_unlock_notify`: 使用此標籤來啟用 [SQLite3](https://sqlite.org/) 資料庫,建議只有少數人時才使用此模式。
* `pam`: 使用此標籤來啟用 PAM (Linux Pluggable Authentication Modules) 認證,對於系統使用者來說,此方式最方便了。
-現在您可以開始編譯執行檔了,我們建議使用 `bindata` 編譯選項,使用 `bindata` 選項前,您必須執行 `generate` 任務將所有資源都一起編譯進去,否則相關資源都不會被編譯進執行檔:
+現在您可以開始編譯執行檔了,我們建議使用 `bindata` 編譯選項:
```
-TAGS="bindata" make generate build
+TAGS="bindata" make build
```
**注意**: 因為使用了套件管理工具,我們建議 Go 環境版本為 1.6 或者是更高,這樣不用在 Go 1.5 版本設定全域變數 `GO15VENDOREXPERIMENT`。