From f121db3b75c06a2941eff383c71760ec0a9dc357 Mon Sep 17 00:00:00 2001 From: Evgenii Alekseev Date: Fri, 19 Apr 2024 20:36:59 +0300 Subject: [PATCH] ci: get rid of development branch --- .github/workflows/build.yml | 6 ++++-- CONTRIBUTING.md | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f4fd46c8..07b80d9b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,9 +2,11 @@ name: build & tests on: push: - branches: [ development, master ] + branches: + - master pull_request: - branches: [ development, master ] + branches: + - master env: BUILD_TYPE: Release diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b5e2eb35..b078ee55 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -81,8 +81,8 @@ Development * Try to minimize message in Release build with logging disabled. It is highly recommended to fix KDE/Qt specific warning if possible * Do not use dependency to KDE libraries if there are no any strictly necessary. Exceptions are KNotification and KI18n libraries. * It is highly recommended to use submodules for third party libraries if possible. -* The main branch is **development**. Changes in this branch may be merged to the master one only if it is a 'stable' build. -* For experimental features development new branch `feature-foo` creation is allowed and recommended. +* The main branch is **master**. +* For experimental features development new branch `feature/foo` creation is allowed and recommended. * Experimental features should be added inside `BUILD_FUTURE` definition: ```