Merge branch 'main' into mergify/bp/master/pr-471

greenbone · Oct 21, 2021 · bf0b74f · bf0b74f
2 parents 8a36506 + 93aee16
commit bf0b74f
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 42 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -28,4 +28,4 @@
 <!-- to check an item, place an "x" in the box like so: "- [x] Tests" -->
 
 - [ ] Tests
-- [ ] [CHANGELOG](https://github.com/greenbone/ospd/blob/master/CHANGELOG.md) Entry
+- [ ] [CHANGELOG](https://github.com/greenbone/ospd/blob/main/CHANGELOG.md) Entry
diff --git a/.github/workflows/ci-python.yml b/.github/workflows/ci-python.yml
@@ -2,9 +2,9 @@ name: Build and test Python package
 
 on:
   push:
-    branches: [ master, ospd-21.04, ospd-20.08, middleware ]
+    branches: [ main, stable, oldstable, middleware ]
   pull_request:
-    branches: [ master, ospd-21.04, ospd-20.08, middleware ]
+    branches: [ main, stable, oldstable, middleware ]
 
 jobs:
   linting:

diff --git a/.github/workflows/codeql-analysis-python.yml b/.github/workflows/codeql-analysis-python.yml
@@ -2,9 +2,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master, ospd-21.04, ospd-20.08, middleware ]
+    branches: [ main, stable, oldstable, middleware ]
   pull_request:
-    branches: [ master, ospd-21.04, ospd-20.08, middleware ]
+    branches: [ main, stable, oldstable, middleware ]
   schedule:
     - cron: '30 5 * * 0' # 5:30h on Sundays
 

diff --git a/.mergify.yml b/.mergify.yml
@@ -1,57 +1,57 @@
 pull_request_rules:
-  # backports from master branch
-  - name: backport master patches to 21.04 branch
+  # backports from main branch
+  - name: backport main patches to stable branch
     conditions:
-      - base=master
-      - label=backport-to-21.04
+      - base=main
+      - label=backport-to-stable
     actions:
       backport:
         branches:
-          - ospd-21.04
+          - stable
 
-  - name: backport master patches to 20.08 branch
+  - name: backport main patches to oldstable branch
     conditions:
-      - base=master
-      - label=backport-to-20.08
+      - base=main
+      - label=backport-to-oldstable
     actions:
       backport:
         branches:
-          - ospd-20.08
+          - oldstable
 
   # backports from upcoming release branch
-  - name: backport 21.04 patches to master branch
+  - name: backport stable patches to main branch
     conditions:
-      - base=ospd-21.04
-      - label=backport-to-master
+      - base=stable
+      - label=backport-to-main
     actions:
       backport:
         branches:
-          - master
+          - main
 
-  - name: backport 21.04 patches to 20.08 branch
+  - name: backport stable patches to oldstable branch
     conditions:
-      - base=ospd-21.04
-      - label=backport-to-20.08
+      - base=stable
+      - label=backport-to-oldstable
     actions:
       backport:
         branches:
-          - ospd-20.08
+          - oldstable
 
   # backports from current release branch
-  - name: backport 20.08 patches to master branch
+  - name: backport oldstable patches to main branch
     conditions:
-      - base=ospd-20.08
-      - label=backport-to-master
+      - base=oldstable
+      - label=backport-to-main
     actions:
       backport:
         branches:
-          - master
+          - main
 
-  - name: backport 20.08 patches to 21.04 branch
+  - name: backport oldstable patches to stable branch
     conditions:
-      - base=ospd-20.08
-      - label=backport-to-21.04
+      - base=oldstable
+      - label=backport-to-stable
     actions:
       backport:
         branches:
-          - ospd-21.04
+          - stable
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,7 +33,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Removed
 - Remove dry run from ospd. [#402](https://github.com/greenbone/ospd-openvas/pull/402)
 
-[21.10.0]: https://github.com/greenbone/ospd/compare/ospd-21.04...master
+[21.10.0]: https://github.com/greenbone/ospd/compare/stable...main
 
 ## [21.4.0] (unreleased)
 
@@ -47,7 +47,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Removed
 - Remove python3.5 support and deprecated methods. [#316](https://github.com/greenbone/ospd/pull/316)
 
-[21.4.0]: https://github.com/greenbone/ospd/compare/ospd-20.08...master
+[21.4.0]: https://github.com/greenbone/ospd/compare/oldstable...main
 
 ## [20.8.3] (Unreleased)
 ### Added
@@ -81,7 +81,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   [#377](https://github.com/greenbone/ospd/pull/377)
   [#380](https://github.com/greenbone/ospd/pull/380)
 
-[20.8.2]: https://github.com/greenbone/ospd/compare/v20.8.1...ospd-20.08
+[20.8.2]: https://github.com/greenbone/ospd/compare/v20.8.1...oldstable
 
 ## [20.8.1] (2020-08-12)
 
@@ -150,7 +150,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Removed
 - Remove support for resume task. [#266](https://github.com/greenbone/ospd/pull/266)
 
-[20.8.0]: https://github.com/greenbone/ospd/compare/ospd-2.0...ospd-20.08
+[20.8.0]: https://github.com/greenbone/ospd/compare/ospd-2.0...oldstable
 
 ## [2.0.1]
 
@@ -227,7 +227,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Improve error handling when sending data. [#147](https://github.com/greenbone/ospd/pull/147)
 - Fix classifier in setup.py. [#154](https://github.com/greenbone/ospd/pull/154)
 
-[2.0]: https://github.com/greenbone/ospd/compare/ospd-1.3...master
+[2.0]: https://github.com/greenbone/ospd/compare/ospd-1.3...main
 
 
 ## [1.3] (2018-06-05)

diff --git a/README.md b/README.md
@@ -4,9 +4,9 @@
 
 [![GitHub releases](https://img.shields.io/github/release/greenbone/ospd.svg)](https://github.com/greenbone/ospd/releases)
 [![PyPI](https://img.shields.io/pypi/v/ospd.svg)](https://pypi.org/project/ospd/)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/greenbone/ospd/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/greenbone/ospd/?branch=master)
-[![code test coverage](https://codecov.io/gh/greenbone/ospd/branch/master/graphs/badge.svg)](https://codecov.io/gh/greenbone/ospd)
-[![CircleCI](https://circleci.com/gh/greenbone/ospd/tree/master.svg?style=svg)](https://circleci.com/gh/greenbone/ospd/tree/master)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/greenbone/ospd/badges/quality-score.png?b=main)](https://scrutinizer-ci.com/g/greenbone/ospd/?branch=main)
+[![code test coverage](https://codecov.io/gh/greenbone/ospd/branch/main/graphs/badge.svg)](https://codecov.io/gh/greenbone/ospd)
+[![CircleCI](https://circleci.com/gh/greenbone/ospd/tree/main.svg?style=svg)](https://circleci.com/gh/greenbone/ospd/tree/main)
 
 ospd is a base class for scanner wrappers which share the same communication
 protocol: OSP (Open Scanner Protocol). OSP creates a unified interface for

diff --git a/RELEASE.md b/RELEASE.md
@@ -44,7 +44,7 @@ first time.
 
   ```sh
   git fetch upstream
-  git checkout -b create-new-release upstream/master
+  git checkout -b create-new-release upstream/main
   ```
 
 * Get the current version number
@@ -142,11 +142,11 @@ first time.
 
 * Ask another developer/maintainer to review and merge the PR.
 
-* Once the PR is merged, update the local `master` branch:
+* Once the PR is merged, update the local `main` branch:
 
   ```sh
   git fetch upstream
-  git rebase upstream/master master
+  git rebase upstream/main main
   ```
 
 * Create a git tag:
@@ -173,7 +173,7 @@ first time.
 
 * Check if new version is available at <https://pypi.org/project/ospd>.
 
-## Bumping `master` Branch to the Next Version
+## Bumping `main` Branch to the Next Version
 
 
 * Update to a Development Version