From 402c09e02886fb75a3b696ac5c43f361e87d74ba Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sat, 28 Nov 2020 09:14:15 +0100
Subject: [PATCH] Update CONTRIBUTING and more travis removing (#4179)

---
 .appveyor.yml           |  2 --
 .dockerignore           |  1 -
 .github/CONTRIBUTING.md | 25 ++++++++++++++++---------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 2b967288..8a89b264 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -4,14 +4,12 @@ version: build {build}
 # More details here: https://www.appveyor.com/docs/appveyor-yml and https://www.appveyor.com/docs/how-to/filtering-commits
 skip_commits:
   files:
-    - .ci/travis-*
     - .github/
     - .tx/
     - webclient/
     - .clang-format
     - .*ignore
     - .codacy.yml
-    - .travis.yml
     - '**/*.md'
     - Dockerfile
     - LICENSE
diff --git a/.dockerignore b/.dockerignore
index 075acd68..2abeb272 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,7 +1,6 @@
 .git/
 build/
 .github/
-.travis/
 .tx/
 cockatrice/
 doc/
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 2b36452f..29173257 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -389,12 +389,15 @@ https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ).
 
 ### Publishing A New Release ###
 
-GitHub Actions will upload binaries (Linux & macOS) when any release is published 
-on GitHub.<br>
-AppVeyor is configured to upload binaries (Windows) to GitHub Releases whenever a
-<kbd>tag</kbd> is pushed.<br>
-You can create a tag when publishing a (pre-)release, but you can also push one
-manually and use it in the release.
+We use [GitHub Releases](https://github.com/Cockatrice/Cockatrice/releases) to publish 
+new stable versions and betas:
+- GitHub Actions will upload binaries (**Linux & macOS**) when any release is published 
+on GitHub.
+- AppVeyor will upload binaries (**Windows**) whenever a
+git "tag" is pushed to the repository.
+
+To trigger both processes correctly you can publish a tagged (pre-)release right on GitHub, 
+or create a tag manually first and use it for the (pre-)release creation afterwards.
 
 To create a tag, simply do the following:
 ```bash
@@ -413,12 +416,16 @@ You should define the variables as such:
     With *MAJ.MIN.PATCH* being the NEXT release version!
 ```
 
+>**Important:** You have to use the naming pattern `-beta` for the first beta release of one 
+version, followed by `-beta.2`, `-beta.3` and counting...
+>This is crucial as Appveyor listens only for correct tags matching our defined pattern.
+
 This will cause a tagged release to be established on the GitHub repository,
-which will then lead to the upload of binaries by Appveyor.
+which will then lead to the upload of binaries by AppVeyor.
 If you use a SemVer tag including "beta", the release that will be created at GitHub 
-by the CI will be marked as a "Pre-release".
+by AppVeyor will be marked as a "Pre-release" automatically.
 The target of the `.../latest` URL will not be changed in that case - 
-it always points to the latest stable release and not pre-releases.
+it always points to the latest stable release and not pre-releases/betas.
 
 If you accidentally push a tag incorrectly (the tag is outdated, you didn't
 pull in the latest branch accidentally, you named the tag wrong, etc.) you can