From 953a770a2157a29613b2b9e39626ad6c20bef7b8 Mon Sep 17 00:00:00 2001
From: Toni Uhlig <matzeton@googlemail.com>
Date: Tue, 30 Aug 2022 12:51:45 +0200
Subject: updated Gitlab/Github CI branches
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
---
.github/workflows/build.yml | 4 ++--
.gitlab-ci.yml | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 96f441b..1501df5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,10 +2,10 @@ name: Build
on:
push:
branches:
- - master
+ - main
pull_request:
branches:
- - master
+ - main
types: [opened, synchronize, reopened]
release:
types: [created]
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2803d10..b4571eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,7 @@ makedeps:
{ make deps JOBS=${BUILDJOBS:-4} Q= || { cat bld/build.log; false; }; }
stage: deps
only:
- - master
+ - main
makedeps-again:
script:
@@ -44,7 +44,7 @@ makedeps-again:
- make deps JOBS=${BUILDJOBS:-4} Q= || { cat bld/build.log; false; }
stage: deps
only:
- - master
+ - main
when: manual
build:
@@ -65,6 +65,6 @@ build:
- _install/
stage: build
only:
- - master
+ - main
dependencies:
- makedeps
--
cgit v1.2.3