From 86878063d9d7f1ebfb83221c5344baf9467c457e Mon Sep 17 00:00:00 2001 From: Ashish Amarnath Date: Thu, 28 May 2020 10:28:35 -0700 Subject: [PATCH 1/3] update build status badge on readme Signed-off-by: Ashish Amarnath --- .github/workflows/push.yml | 2 +- README.md | 4 ++-- site/docs/master/README.md | 4 ++-- site/docs/v1.4/README.md | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 25e06ae93..996c9780e 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,4 +1,4 @@ -name: Push +name: Master CI on: push: diff --git a/README.md b/README.md index d5ef05bd0..bfc1b9391 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,8 @@ If you are ready to jump in and test, add code, or help with documentation, foll See [the list of releases][6] to find out about feature changes. -[1]: https://travis-ci.org/vmware-tanzu/velero.svg?branch=master -[2]: https://travis-ci.org/vmware-tanzu/velero +[1]: https://github.com/vmware-tanzu/velero/workflows/Master%20CI/badge.svg +[2]: https://github.com/vmware-tanzu/velero/actions?query=workflow%3A"Master+CI" [4]: https://github.com/vmware-tanzu/velero/issues [6]: https://github.com/vmware-tanzu/velero/releases [9]: https://kubernetes.io/docs/setup/ diff --git a/site/docs/master/README.md b/site/docs/master/README.md index cacf4289e..747cc079e 100644 --- a/site/docs/master/README.md +++ b/site/docs/master/README.md @@ -33,8 +33,8 @@ If you are ready to jump in and test, add code, or help with documentation, foll See [the list of releases][6] to find out about feature changes. -[1]: https://travis-ci.org/vmware-tanzu/velero.svg?branch=master -[2]: https://travis-ci.org/vmware-tanzu/velero +[1]: https://github.com/vmware-tanzu/velero/workflows/Master%20CI/badge.svg +[2]: https://github.com/vmware-tanzu/velero/actions?query=workflow%3A"Master+CI" [4]: https://github.com/vmware-tanzu/velero/issues [6]: https://github.com/vmware-tanzu/velero/releases diff --git a/site/docs/v1.4/README.md b/site/docs/v1.4/README.md index a4b2c8ec7..74b5aeefa 100644 --- a/site/docs/v1.4/README.md +++ b/site/docs/v1.4/README.md @@ -33,8 +33,8 @@ If you are ready to jump in and test, add code, or help with documentation, foll See [the list of releases][6] to find out about feature changes. -[1]: https://travis-ci.org/vmware-tanzu/velero.svg?branch=master -[2]: https://travis-ci.org/vmware-tanzu/velero +[1]: https://github.com/vmware-tanzu/velero/workflows/Master%20CI/badge.svg +[2]: https://github.com/vmware-tanzu/velero/actions?query=workflow%3A"Master+CI" [4]: https://github.com/vmware-tanzu/velero/issues [6]: https://github.com/vmware-tanzu/velero/releases From 6aecc0f6b190e1aebaf78e1bd180b3b382ae3a15 Mon Sep 17 00:00:00 2001 From: Ashish Amarnath Date: Thu, 28 May 2020 11:48:59 -0700 Subject: [PATCH 2/3] remove travis config Signed-off-by: Ashish Amarnath --- .travis.yml | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index dab15d2bb..000000000 --- a/.travis.yml +++ /dev/null @@ -1,24 +0,0 @@ -dist: xenial -language: go -go: -- 1.14.x -sudo: required -services: -- docker -script: -- export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; - else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) -- echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$TRAVIS_PULL_REQUEST, BRANCH=$BRANCH" -- hack/ci-check.sh -deploy: -- provider: script - skip_cleanup: true - script: hack/docker-push.sh - on: - repo: vmware-tanzu/velero - all_branches: true -env: - global: - # generated using `travis encrypt`: https://docs.travis-ci.com/user/environment-variables#encrypting-environment-variables - - secure: Sa0R7bhOvrybIWvURjEpOLQ3/v1IqiSM2uwYTSMhLtwHunkiYXpbXi/wVPkujM7kgnFeJzGfNTZI6blkl3Vnz6Ca48avxiv+KRk7bNlTn/e2LkJaqOh/NcwqrVyWG8cZpWTHAzwJkHrV6xcWRTWFqx/UhUHH4PdmXd0pj3/DDxHhUZXJkZfYDC2uI+kmhJd9x1yxxz6OTXrGeMw22R5RtgltcQYjYWjGhXjNJ96+0QhC6juCwwtuU3oz7vfV1dP6ea9yeiHKCdDR0xp/Ymtlt4DULgQv4vuVBCR7LuPjsdLI1QslKbCz+vk/XwEcckf3R+yJUaArGLSM0f3AwuAZnETwkfKu9gJCEz8Xvvwsy5QHj/DGeSr+JY4Ylb1YzJG48R5QMcNwOgQOpewamBggxkyyOlNanUGzMJ8F7zjDOZjOUsRSSG+cn01/oJEHNyFmNkxbugOGuxqpi8qIfyWrdPSb8AdnUVUi2GDR/unSm2uZLSJtjaeypqzxalFdL04pbkk6/vKZTi6VMIyewHeR0XIC/VKQ+av2CwjnfqTtTHQHMh2kVxVzy4SKPYgWvbUUg9SG0z2lmfBWzE1HS+ozUKruxBu/YnPHaFz3D/+w0AwtHSYp3FMkCC/2SZU1hiOzAKX+S8T5K1OKoBiIEEUVa90EnSslCIiNIUHXgdtG62U= - - secure: MAHgHvxxPJKxcECwdjaTa/ZW2wlhfcpcprXZqPJKQVFS6S5Wc+xf0CBRggnZT/aEs52EpD2bZy505a4uy9EcTDeq7q5oaXbOBFdyKgB1leWiycup60p6BmVqre5//EzXe+CJpkSu46ajcVORJIEGjs0tS5p0HV70sqpsfd13L2pXpmZ54RIj+TOm7Tz6VVeSNUmQ7WymIrvKg4cQ50w+aS7ak+gy8b6oYKWX01oZPQZA3W1pvYcBgBKobiQN8dh7WvT6QmTu/38WykTjt+9CfEJOboitgEESMjf06ueaLrhQoKQafH3XzfkfEW7PWWGl1RZYMEf15Joj1edIW1i9eYZ1T3fvBaIwvgc7lLgNdzc5ZxG8eEtoDSfB0+gDJOPBLCo+5G3xvRCie7OkKvXdijkCKmc+FRMJlayHkEw75cgId9svDEJghtt2VlWAM4ba4S79Og+cyI0VROkzS0FEjabz74tU9haVaypVnLmzEC/BhilzCt/jhRuYInpsMBeasGQ6Rg8gjos4AQamdaXJRI520o7zFWXVYqctfPr+mrVOYCfUISnSS3uqb4UlvLBqXDPVWBBIgmPrSgvHXxbjsajFuyWTULm60nj/JUuh7BC9HF9pil3g4/2E9cpLZCFQxVYu6+30eEv4dCO7Ptq3XIINDWbbS6Pmw62/ZsE8ABU= From be48119c506b27d5a9fcf774aef30899fd8c8570 Mon Sep 17 00:00:00 2001 From: Ashish Amarnath Date: Thu, 28 May 2020 12:00:07 -0700 Subject: [PATCH 3/3] update release instructions Signed-off-by: Ashish Amarnath --- site/docs/master/release-instructions.md | 2 +- site/docs/v1.4/release-instructions.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/docs/master/release-instructions.md b/site/docs/master/release-instructions.md index 3e06bdd3e..d1fb717f2 100644 --- a/site/docs/master/release-instructions.md +++ b/site/docs/master/release-instructions.md @@ -57,7 +57,7 @@ This process is the same for both pre-release and GA, except for the fact that t 1. Make sure your working directory is clean: `git status` should show `nothing to commit, working tree clean`. 1. Run `git fetch upstream master && git checkout upstream/master`. 1. Run `git tag $VELERO_VERSION (e.g. `git tag v1.2.0` or `git tag v1.2.0-beta.1`). -1. Run `git push upstream $VELERO_VERSION` (e.g. `git push upstream v1.2.0` or `git push upstream v1.2.0-beta.1`). This will trigger the Travis CI job that builds/publishes the Docker images. +1. Run `git push upstream $VELERO_VERSION` (e.g. `git push upstream v1.2.0` or `git push upstream v1.2.0-beta.1`). This will trigger the github action that builds/publishes the Docker images. 1. Generate the GitHub release (it will be created in "Draft" status, which means it's not visible to the outside world until you click "Publish"): ```bash diff --git a/site/docs/v1.4/release-instructions.md b/site/docs/v1.4/release-instructions.md index b77f6ac18..bf74c3413 100644 --- a/site/docs/v1.4/release-instructions.md +++ b/site/docs/v1.4/release-instructions.md @@ -57,7 +57,7 @@ This process is the same for both pre-release and GA, except for the fact that t 1. Make sure your working directory is clean: `git status` should show `nothing to commit, working tree clean`. 1. Run `git fetch upstream master && git checkout upstream/master`. 1. Run `git tag ` (e.g. `git tag v1.2.0` or `git tag v1.2.0-beta.1`). -1. Run `git push upstream ` (e.g. `git push upstream v1.2.0` or `git push upstream v1.2.0-beta.1`). This will trigger the Travis CI job that builds/publishes the Docker images. +1. Run `git push upstream ` (e.g. `git push upstream v1.2.0` or `git push upstream v1.2.0-beta.1`). This will trigger the github action that builds/publishes the Docker images. 1. Generate the GitHub release (it will be created in "Draft" status, which means it's not visible to the outside world until you click "Publish"): ```bash