Apply CI-related fixes

Author: PawelLipski

.travis.yml

@@ -34,20 +34,25 @@ jobs:
           password:
             secure: U6JJcByjLv2PutUpnpqDT7cNIUYu9Ap9t4G90KULEn6Syxa49aX14BT6k2jBakWbQgrPCxLLNSWeCoC4xPl/Z2/9HLEFxZLVovtVbiaJ8HrTcoWmEZijnGob9Ofh94TFP8VtifjqHXeIrPi78XyZEks/ed0Sj3jSH4BL74PDHvqbD1RnsezFm4QGI2ESOWY+laJ2ralcpHRJh0hJb0QHxOpbKPVM+QefiFs+VFkFP25hQcn/G3qdduzW5NQ8OHBYCbevy6/1yt/M67ZzAeA0n4UrkZ/3vBsMJJ3wynWWZ3xO+lGs6eqZ31E8vicogYbw5hXs119JRkKUrcU5uqVL1mogf8N6y76w2xNV6Aul/XtpBiuPQsHm0tChwTI6yyGzAZBRPMB1KzRclDKGQThIBhpX+wfqHSpvdj1CZV5AMm3+6nHA0LSGWiuJ1BW7pTrAp9YFPbrQfH59JWMhy8ng5lexcQQj7spSO/DPw0VMIfUiw644BfSfyZwls5du4yYfWOkd8RoELEa2IGqCp1sTqjWvSuX3nzKCbJhxAwrVU5mK9fiMPcL1jURIwlFvooI+qKAp3CdGZ1IM+HFmpzXym2kvZvmrNXduVSZcqG3DrCFxt77FYsN5SNB/uly1vLq/6Y0BaCw9ao6YWfW3fvU2cCcyejjzPyfGzZ2jA5uOpZ8=
           distributions: "sdist bdist_wheel"
+          on: { tags: true }
 
         - provider: script  # RPM (actually build only, no deployment - will be deployed to the Github release)
           skip_cleanup: true
           script: bash ci/rpm/travis-deploy.sh
+          on: { tags: true }
 
         - provider: releases  # Github (rpm files must be in dist/ first)
           skip_cleanup: true
           token:
             secure: arhgNhJMfVq8xaa5xMswvjkgfgE8dDJ6BM0X+HI28m7BrwjxaVyr5Ct1qIohEQSZOpihwHzFLLwzSICc5sR6H8Ai4yYcm/sLGOAHyp4p1HeAXPqbtyUtn3rbcjsKXSfwjntkGommC6sYoY5GZhJy2qcRQIADjRMPQWRURY5/6KBBY05scL2vVpQw2NHp2pNCiMSDhokFsN3mv1PX15QDJdKFuIrD61cD15ljkwol7OJ+wKzGozyJB6GHkWi7WsGXsgdzjruHY7tcqPEksa+sWxxGGMmLQ7gVruVUlguunACjh0xlZvMBDKWEeffvRy9JSkAKVccTtaiZw9beoCaihZOVys/Bw4Znv3e+UpkOOrBwMFOdjc1R/Kz1/aewuYFckKhP/opdkpOj3T0VIckmK4s/vWYWhHLRiAHE4gb47UxYIKHGqPfs9XMyZryRF6iaTm3LKtTb+ufM0OQEKtWR0MBBRmpqapx74Jd6tuf7n4KbsS4ZuVeb27+OBhfogpYdfGW2KxzwCOwYl+iGCsNkPyMUOmqo8MfFvwEsHU7SnZ1G2tcSoptT8+Bj8n2lKB7sf/llywUJxKKG9kpK9Y9Tc6yvtgjj4ewjsjgaGCksS5jVPk223WEHu/iX4FK4Ftms9cXWLbQpMKW4dACyAEu8ONIRw+TXvUFA2J3wWsOiQNk=
           file_glob: true
           file: dist/git-machete-*.noarch.rpm
+          on: { tags: true }
 
         - provider: script  # brew tap (artifacts must be released to PyPI first)
           script: bash ci/homebrew-tap/travis-deploy.sh
+          on: { tags: true }
 
         - provider: script  # PPA
           script: bash ci/apt-ppa-upload/travis-deploy.sh
+          on: { tags: true }

CONTRIBUTING.md

@@ -53,6 +53,8 @@ Output format of any non-plumbing command can change in non-backward-compatible
 1. Make sure that build for `master` passes on [Travis CI](https://travis-ci.org/VirtusLab/git-machete/branches).
 
 1. Verify that a build started for [Snap](https://build.snapcraft.io/user/VirtusLab/git-machete).
+   If not, check build.snapcraft.io webhook on Github (under Settings > Webhooks) -
+   sometimes the build system responds with 500 status for no clear reason, in such case `Redeliver` the call.
    Once ready, install the `latest/edge` revision locally (`sudo snap install --edge git-machete`)
    and verify that it works correctly, esp. wrt. push/pull via ssh/https and editor (`git machete edit` and interactive rebases).
 
@@ -66,17 +68,20 @@ Output format of any non-plumbing command can change in non-backward-compatible
 
 1. Verify that the release has been created on [Github](https://github.com/VirtusLab/git-machete/releases)
    and that a `git-machete-VERSION-1.noarch.rpm` file is present under the Assets.
+
    Fix the formatting in the description manually by copy-pasting the tag description
    (see [this answer](https://github.community/t5/How-to-use-Git-and-GitHub/add-release-notes-to-git-remote-tag-from-command-line/m-p/22343/highlight/true#M6488)
    for more details on why it's not automated as well).
 
 1. Verify that the latest version is uploaded to [PyPI](https://pypi.org/project/git-machete).
 
 1. Verify that the latest commit in [VirtusLab/homebrew-git-machete](https://github.com/VirtusLab/homebrew-git-machete) tap repo refers to the latest version.
+
    Re-run the latest build for `orphan/brew-package-check` branch on [Travis CI](https://travis-ci.org/VirtusLab/git-machete/branches).
    Inspect the job output and verify that the latest version gets correctly installed on Mac OS X (esp. see the output of `git machete --version`).
 
 1. Verify that a build started on [git-machete PPA](https://launchpad.net/~virtuslab/+archive/ubuntu/git-machete/+packages).
+
    Once the new version package is published and the old one is removed (typically takes around 20-30 min),
    follow the instructions from [ci/apt-ppa-test-install/README.md](https://github.com/VirtusLab/git-machete/tree/master/ci/apt-ppa-test-install).
    Inspect the output of `docker-compose` and verify that the latest version gets correctly installed on Ubuntu (esp. see the output of `git machete --version`).
@@ -88,5 +93,6 @@ Output format of any non-plumbing command can change in non-backward-compatible
    If the release introduces significant changes/critical bugfixes, please [flag the package as out of date](https://aur.archlinux.org/pkgbase/git-machete/flag).
 
 1. A [git-machete package](https://nixos.org/nixos/packages.html?channel=nixos-unstable&query=git-machete) is available for NixOS.
+
    [Version-bump PRs to NixOS/nixpkgs](https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+git-machete) are opened by a semi-automatic update on an irregular basis.
    There is an issue ([#79](https://github.com/VirtusLab/git-machete/issues/79)) for opening version-bump PRs automatically on each release.

README.md

@@ -67,7 +67,7 @@ Install the AUR package [git-machete](https://aur.archlinux.org/packages/git-mac
 
 ### Using Nix (macOS & most Linux distributions)
 
-On macOS and most Linux distributions, you can install via [Nix](https://nixos.org/nix/):
+On macOS and most Linux distributions, you can install via [Nix](https://nixos.org/nix):
 
 ```shell script
 nix-channel --add https://nixos.org/channels/nixos-unstable unstable  # if you haven't set up any channels yet

ci/checks/links.sh

@@ -8,4 +8,5 @@ set -e -o pipefail -u
 
 git ls-files | grep -v '^ci/' | xargs grep -ho "https://[^]') ]*" | sort -u | xargs -t -l curl -LfsI --max-time 10 -o/dev/null -w "> %{http_code}\n" || {
   echo "Some of the links found in the codebase did not return 2xx HTTP status, please fix"
+  exit 1
 }