From ae4e74aa6b9e49db3d5379be9d4775d62824f2f8 Mon Sep 17 00:00:00 2001 From: Robert van Gent Date: Mon, 30 Aug 2021 16:16:39 -0700 Subject: [PATCH] all: update stale refs to Travis (#312) --- CONTRIBUTING.md | 4 ++-- README.md | 2 +- internal/check_api_change.sh | 7 ++----- internal/listdeps.sh | 4 ++-- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 68445fc..ee19499 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -78,11 +78,11 @@ again. If you are submitting code on behalf of your employer, there's a single commit before merging your change. * Check the diffs, write a useful description (including something like `Fixes #123` if it's fixing a bug) and send the PR out. -* [Travis CI](http://travis-ci.com) will run tests against the PR. This should +* Github will run tests against the PR. This should happen within 10 minutes or so. If a test fails, go back to the coding stage and try to fix the test and push the same branch again. You won't need to make a new pull request, the changes will be rolled directly into the PR you - already opened. Wait for Travis again. There is no need to assign a reviewer + already opened. Wait for the tests again. There is no need to assign a reviewer to the PR, the project team will assign someone for review during the standard [triage](#triaging) process. diff --git a/README.md b/README.md index 10983be..839529a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Wire: Automated Initialization in Go -[![Build Status](https://travis-ci.com/google/wire.svg?branch=master)][travis] +[![Build Status](https://github.com/github/google/wire/workflows/tests.yml/badge.svg?branch=main) [![godoc](https://godoc.org/github.com/google/wire?status.svg)][godoc] [![Coverage](https://codecov.io/gh/google/wire/branch/master/graph/badge.svg)](https://codecov.io/gh/google/wire) diff --git a/internal/check_api_change.sh b/internal/check_api_change.sh index 19265ba..273aace 100755 --- a/internal/check_api_change.sh +++ b/internal/check_api_change.sh @@ -21,14 +21,11 @@ # This script expects: # a) to be run at the root of the repository # b) HEAD is pointing to a commit that merges between the pull request and the -# upstream branch (TRAVIS_BRANCH). This is what Travis does (see -# https://docs.travis-ci.com/user/pull-requests/ for details), but if you -# are testing this script manually, you may need to manually create a merge -# commit. +# upstream branch (GITHUB_HEAD_REF). set -euo pipefail -UPSTREAM_BRANCH="${TRAVIS_BRANCH:-master}" +UPSTREAM_BRANCH="${GITHUB_HEAD_REF:-master}" echo "Checking for incompatible API changes relative to ${UPSTREAM_BRANCH}..." MASTER_CLONE_DIR="$(mktemp -d)" diff --git a/internal/listdeps.sh b/internal/listdeps.sh index 3b79f4b..fc99ade 100755 --- a/internal/listdeps.sh +++ b/internal/listdeps.sh @@ -20,6 +20,6 @@ set -euo pipefail # $ internal/listdeps.sh > internal/alldeps # # Important note: there are changes in module tooling behavior between go 1.11 -# and go 1.12; please make sure to use the same version of Go as used by Travis -# (see .travis.yml) when updating the alldeps file. +# and go 1.12; please make sure to use the same version of Go as used by Github +# Actions (see .github/workflows/tests.yml) when updating the alldeps file. go list -deps -f '{{with .Module}}{{.Path}}{{end}}' ./... | sort | uniq