From 5850f0ff14bdef6dceffcb4e298a7be26bc9bc5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A3=D0=B2=D0=B0=D1=80=D0=BE=D0=B2=20=D0=A1=D0=B5=D1=80?=
=?UTF-8?q?=D0=B3=D0=B5=D0=B9=20=D0=90=D0=BD=D0=B0=D1=82=D0=BE=D0=BB=D1=8C?=
=?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=87?= <usa@skbkontur.ru>
Date: Thu, 12 Sep 2024 17:05:38 +0500
Subject: [PATCH] Migrate to GitLab CI
---
.github/workflows/merge-master.yml | 28 ----------------------------
1 file changed, 28 deletions(-)
delete mode 100644 .github/workflows/merge-master.yml
diff --git a/.github/workflows/merge-master.yml b/.github/workflows/merge-master.yml
deleted file mode 100644
index 7847f37..0000000
--- a/.github/workflows/merge-master.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Merge master
-
-on:
- push:
- branches:
- - master
-
-jobs:
- merge-branch:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@master
-
- - name: Merge master -> with-net6.0
- uses: devmasx/merge-branch@master
- with:
- type: now
- target_branch: with-net6.0
- github_token: ${{ github.token }}
- disable_fastforwards: true
-
- - name: Merge master -> only-net6.0
- uses: devmasx/merge-branch@master
- with:
- type: now
- target_branch: only-net6.0
- github_token: ${{ github.token }}
- disable_fastforwards: true