Skip to content

Commit 15ad4ed

Browse files
committed
ci: drop master branch from workflow triggers
Also, polish the remaining docs hits to 'master'. Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
1 parent eb30df6 commit 15ad4ed

File tree

5 files changed

+6
-9
lines changed

5 files changed

+6
-9
lines changed

.github/workflows/ci.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ on:
33
push:
44
branches:
55
- main
6-
- master
76
- 'release-*'
87
pull_request:
98
branches:
10-
- master
119
- main
1210
- 'release-*'
1311
env:

.github/workflows/publish.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- main
7-
- master
87
- release-0.19
98

109
jobs:
@@ -20,7 +19,7 @@ jobs:
2019
- uses: actions/checkout@v2
2120
with:
2221
fetch-depth: 0
23-
ref: master
22+
ref: main
2423
- name: Set up doc directory
2524
run: |
2625
mkdir $HOME/output

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Overview
2-
[![Build Status](https://github.com/intel/intel-device-plugins-for-kubernetes/workflows/CI/badge.svg?branch=master)](https://github.com/intel/intel-device-plugins-for-kubernetes/actions?query=workflow%3ACI)
2+
[![Build Status](https://github.com/intel/intel-device-plugins-for-kubernetes/workflows/CI/badge.svg?branch=main)](https://github.com/intel/intel-device-plugins-for-kubernetes/actions?query=workflow%3ACI)
33
[![Go Report Card](https://goreportcard.com/badge/github.com/intel/intel-device-plugins-for-kubernetes)](https://goreportcard.com/report/github.com/intel/intel-device-plugins-for-kubernetes)
44
[![GoDoc](https://godoc.org/github.com/intel/intel-device-plugins-for-kubernetes/pkg/deviceplugin?status.svg)](https://godoc.org/github.com/intel/intel-device-plugins-for-kubernetes/pkg/deviceplugin)
55

@@ -282,7 +282,7 @@ matching Kubernetes versions are listed below:
282282

283283
## Pre-built plugin images
284284

285-
Pre-built images of the plugins are available on the Docker hub. These images are automatically built and uploaded to the hub from the latest master branch of this repository.
285+
Pre-built images of the plugins are available on the Docker hub. These images are automatically built and uploaded to the hub from the latest main branch of this repository.
286286

287287
Release tagged images of the components are also available on the Docker hub, tagged with their release version numbers in the format x.y.z, corresponding to the branches and releases in this repository.
288288

cmd/dsa_plugin/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Examples are provided showing how to deploy the plugin either using a DaemonSet
3232

3333
[Pre-built images](https://hub.docker.com/r/intel/intel-dsa-plugin)
3434
of this component are available on the Docker hub. These images are automatically built and uploaded
35-
to the hub from the latest master branch of this repository.
35+
to the hub from the latest main branch of this repository.
3636

3737
Release tagged images of the components are also available on the Docker hub, tagged with their
3838
release version numbers in the format `x.y.z`, corresponding to the branches and releases in this
@@ -43,7 +43,7 @@ $ kubectl apply -k https://github.com/intel/intel-device-plugins-for-kubernetes/
4343
daemonset.apps/intel-dsa-plugin created
4444
```
4545

46-
Where `<REF>` needs to be substituted with the desired git ref, e.g. `master`.
46+
Where `<REF>` needs to be substituted with the desired git ref, e.g. `main`.
4747

4848
Nothing else is needed. But if you want to deploy a customized version of the plugin read further.
4949

conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class goLangLexer (GoLexer):
5959
#
6060
##############################################################################
6161

62-
baseBranch = "master"
62+
baseBranch = "main"
6363
sphinx_md_useGitHubURL = True
6464
commitSHA = getenv('GITHUB_SHA')
6565
githubBaseURL = 'https://github.com/' + (getenv('GITHUB_REPOSITORY') or 'intel/intel-device-plugins-for-kubernetes') + '/'

0 commit comments

Comments
 (0)