build: Update CI infrastructure for "master" -> "main" rename

Also remove obsolete Travis build status from the README.md.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2021-08-24 14:16:57 +01:00
parent 25ed8722c7
commit 760031103e
5 changed files with 10 additions and 12 deletions

View File

@ -31,7 +31,7 @@ jobs:
- name: Debug Check (default features) - name: Debug Check (default features)
run: | run: |
git rev-list origin/master..$GITHUB_SHA | xargs -t -I % sh -c 'git checkout %; cargo check --all --target=${{ matrix.target }}' git rev-list origin/main..$GITHUB_SHA | xargs -t -I % sh -c 'git checkout %; cargo check --all --target=${{ matrix.target }}'
git checkout $GITHUB_SHA git checkout $GITHUB_SHA
- name: Build (acpi,kvm) - name: Build (acpi,kvm)

View File

@ -2,7 +2,7 @@ name: Cloud-Hypervisor's Docker image update
on: on:
push: push:
branches: master branches: main
paths: resources/Dockerfile paths: resources/Dockerfile
jobs: jobs:

View File

@ -55,7 +55,7 @@ you want to merge your changes to `cloud-hypervisor`:
into your github organization. into your github organization.
2. Within your fork, create a branch for your contribution. 2. Within your fork, create a branch for your contribution.
3. [Create a pull request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/) 3. [Create a pull request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/)
against the master branch of the Cloud Hypervisor repository. against the main branch of the Cloud Hypervisor repository.
4. Add reviewers to your pull request and then work with your reviewers to address 4. Add reviewers to your pull request and then work with your reviewers to address
any comments and obtain minimum of 2 [maintainers](MAINTAINERS.md) approvals. any comments and obtain minimum of 2 [maintainers](MAINTAINERS.md) approvals.
To update your pull request amend existing commits whenever applicable and To update your pull request amend existing commits whenever applicable and

14
Jenkinsfile vendored
View File

@ -14,7 +14,7 @@ pipeline{
} }
} }
stage ('Cancel older builds') { stage ('Cancel older builds') {
when { not { branch 'master' } } when { not { branch 'main' } }
steps { steps {
cancelPreviousBuilds() cancelPreviousBuilds()
} }
@ -110,7 +110,7 @@ pipeline{
agent { node { label 'bionic-sgx' } } agent { node { label 'bionic-sgx' } }
when { when {
beforeAgent true beforeAgent true
branch 'master' branch 'main'
} }
stages { stages {
stage ('Checkout') { stage ('Checkout') {
@ -146,7 +146,7 @@ pipeline{
agent { node { label 'bionic-vfio' } } agent { node { label 'bionic-vfio' } }
when { when {
beforeAgent true beforeAgent true
branch 'master' branch 'main'
} }
stages { stages {
stage ('Checkout') { stage ('Checkout') {
@ -221,15 +221,15 @@ pipeline{
post { post {
regression { regression {
script { script {
if (env.BRANCH_NAME == 'master') { if (env.BRANCH_NAME == 'main') {
slackSend (color: '#ff0000', message: '"master" branch build is now failing') slackSend (color: '#ff0000', message: '"main" branch build is now failing')
} }
} }
} }
fixed { fixed {
script { script {
if (env.BRANCH_NAME == 'master') { if (env.BRANCH_NAME == 'main') {
slackSend (color: '#00ff00', message: '"master" branch build is now fixed') slackSend (color: '#00ff00', message: '"main" branch build is now fixed')
} }
} }
} }

View File

@ -1,5 +1,3 @@
[![Build Status](https://travis-ci.com/cloud-hypervisor/cloud-hypervisor.svg?branch=master)](https://travis-ci.com/cloud-hypervisor/cloud-hypervisor)
- [1. What is Cloud Hypervisor?](#1-what-is-cloud-hypervisor) - [1. What is Cloud Hypervisor?](#1-what-is-cloud-hypervisor)
- [Objectives](#objectives) - [Objectives](#objectives)
- [High Level](#high-level) - [High Level](#high-level)