From 4367c9e059cf5d71c6910562b8cf8fea3207b528 Mon Sep 17 00:00:00 2001 From: Alberto Bertogli Date: Fri, 22 May 2020 10:15:52 +0100 Subject: [PATCH] travis: Remove references in documentation, allow to fail The Travis tests don't work due to a Travis networking issue reaching some external hosts. Until it is fixed, remove references from the documentation, since its output is misleading. We also allow it to fail, which makes the GitHub UI not show commits as having failed tests because of Travis. Since the previous commit, GitLab CI does almost all the same tests, so there should be no significant loss of coverage anyway. --- .travis.yml | 41 ++++++++++++++++++++--------------------- README.md | 7 +++---- test/README.md | 16 ++++++++++------ 3 files changed, 33 insertions(+), 31 deletions(-) diff --git a/.travis.yml b/.travis.yml index 115a3af..48a75b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,22 +2,27 @@ language: go go_import_path: blitiri.com.ar/go/chasquid -dist: trusty -sudo: false +dist: bionic -go: - # Check against the version in Debian stable. - - 1.11.x - - stable - - master - -env: - # Enable Go modules explicitly on Go 1.11. - # Some packages update in backwards-incompatible ways assuming Go modules - # are in use, which can break the build unexpectedly. - # We can remove this once we no longer support Go 1.11, as it is the default - # in the newer versions. - - GO111MODULE=on +jobs: + include: + - name: "go 1.11 (debian stable)" + go: 1.11.x + # Enable Go modules explicitly on Go 1.11. + # Some packages update in backwards-incompatible ways assuming Go + # modules are in use, which can break the build unexpectedly. + env: GO111MODULE=on + - name: "go stable" + go: stable + - name: "go tip" + go: master + allow_failures: + # There is a bug in the Travis environment where it can't reach certain + # hosts that host Go package dependencies. + # This manifests only in Go 1.11, since subsequent versions use the public + # proxy which has no problems. + # Make the build optional until the issue is fixed. + - go: 1.11.x # This is needed because the repository has a Makefile, so travis won't invoke # "go get" by default. @@ -37,9 +42,3 @@ notifications: email: on_success: change on_failure: always - irc: - channels: - - "ircs://chat.freenode.net:7070/#chasquid" - use_notice: true - on_success: change - on_failure: change diff --git a/README.md b/README.md index 754cf26..da03804 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,11 @@ It is designed mainly for individuals and small groups. It's written in [Go](https://golang.org), and distributed under the [Apache license 2.0](http://en.wikipedia.org/wiki/Apache_License). -[![Travis-CI status](https://travis-ci.org/albertito/chasquid.svg?branch=master)](https://travis-ci.org/albertito/chasquid) +[![Gitlab CI status](https://gitlab.com/albertito/chasquid/badges/master/pipeline.svg)](https://gitlab.com/albertito/chasquid/pipelines) [![Cirrus-CI Status](https://api.cirrus-ci.com/github/albertito/chasquid.svg?branch=next)](https://cirrus-ci.com/github/albertito/chasquid) -[![Gitlab CI status](https://gitlab.com/albertito/chasquid/badges/master/pipeline.svg)](https://gitlab.com/albertito/chasquid/pipelines)\ [![Go Report Card](https://goreportcard.com/badge/github.com/albertito/chasquid)](https://goreportcard.com/report/github.com/albertito/chasquid) -[![Coverage](https://img.shields.io/badge/coverage-next-brightgreen.svg)](https://blitiri.com.ar/p/chasquid/coverage.html) -[![Docs](https://img.shields.io/badge/docs-reference-blue.svg)](https://blitiri.com.ar/p/chasquid/docs/) +[![Coverage](https://img.shields.io/badge/coverage-next-brightgreen.svg)](https://blitiri.com.ar/p/chasquid/coverage.html) +[![Docs](https://img.shields.io/badge/docs-reference-blue.svg)](https://blitiri.com.ar/p/chasquid/) [![Freenode](https://img.shields.io/badge/chat-freenode-blue.svg)](https://webchat.freenode.net/#chasquid) diff --git a/test/README.md b/test/README.md index 85d308d..0617e14 100644 --- a/test/README.md +++ b/test/README.md @@ -84,12 +84,16 @@ constrained or non supported environments. There are two sets of automated tests which are run on every commit to upstream, and weekly: -* [Travis CI](https://travis-ci.org/albertito/chasquid), configured in the - `.travis.yml` file, runs the Go tests. -* [Gitlab CI](https://gitlab.com/albertito/chasquid/commits/master), - configured in the `.gitlab-ci.yml` file, runs integration tests. The tests - are run twice: once against the dependencies listed in `go.mod`, and once - against the latest version of the dependencies. +* [GitLab CI](https://gitlab.com/albertito/chasquid/commits/master), + configured in the `.gitlab-ci.yml` file, runs the Go tests and the + integration tests (using [docker](#docker)). + The integration tests are run twice: once against the dependencies listed in + `go.mod`, and once against the latest version of the dependencies. + It also builds the [public Docker images](docker.md). + +* [Cirrus CI](https://gitlab.com/albertito/chasquid/pipelines), + configured in the `.cirrus.yml` file, runs Go tests on FreeBSD, and a + comprehensive linter. ## Coverage