From 440c76ef2577e2697c1f636579a6aea7f6d24d14 Mon Sep 17 00:00:00 2001 From: LukBukkit Date: Sun, 20 Oct 2019 23:15:07 +0200 Subject: [PATCH 1/2] More information for drone-cli in CONTRIBUTING.md * Increases the version of drone-cli to 1.2.0 * Adds a note for the Docker Toolbox on Windows Signed-off-by: LukBukkit --- CONTRIBUTING.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 93083dc491fb5..2fba925108746 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -72,13 +72,15 @@ Here's how to run the test suite: - Install the correct version of the drone-cli package. As of this writing, the correct drone-cli version is - [1.1.0](https://docs.drone.io/cli/install/). + [1.2.0](https://docs.drone.io/cli/install/). - Ensure you have enough free disk space. You will need at least 15-20 Gb of free disk space to hold all of the containers drone creates (a default AWS or GCE disk size won't work -- see [#6243](https://github.com/go-gitea/gitea/issues/6243)). - Change into the base directory of your copy of the gitea repository, and run `drone exec --event pull_request`. +- At the moment `drone exec` doesn't support the Docker Toolbox on Windows 10 + (see [drone-cli#135](https://github.com/drone/drone-cli/issues/135)) The drone version, command line, and disk requirements do change over time (see [#4053](https://github.com/go-gitea/gitea/issues/4053) and From db424bc7b88b6f6053d6cefa370124daa6a03b1e Mon Sep 17 00:00:00 2001 From: LukBukkit Date: Mon, 21 Oct 2019 16:05:43 +0200 Subject: [PATCH 2/2] Fix the url for the blog repository (now on gitea.com) Signed-off-by: LukBukkit --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2fba925108746..04ffebe62877c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -304,7 +304,7 @@ be reviewed by two maintainers and must pass the automatic tests. * Add a tag as `git tag -s -F release.notes v$vmaj.$vmin.$`, release.notes file could be a temporary file to only include the changelog this version which you added to `CHANGELOG.md`. * And then push the tag as `git push origin v$vmaj.$vmin.$`. Drone CI will automatically created a release and upload all the compiled binary. (But currently it didn't add the release notes automatically. Maybe we should fix that.) * If needed send PR for changelog on branch `master`. -* Send PR to [blog repository](https://github.com/go-gitea/blog) announcing the release. +* Send PR to [blog repository](https://gitea.com/gitea/blog) announcing the release. ## Copyright