Skip to content

Commit a4ca473

Browse files
committed
[CI] cascade end-to-end must not try to merge feature branches
they no longer exist as of the hard fork
1 parent cf1c57b commit a4ca473

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

.forgejo/workflows/cascade-setup-end-to-end.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ on:
44
types:
55
- labeled
66

7-
env:
8-
FEATURE_BRANCHES: "privacy i18n moderation branding dependency"
9-
107
jobs:
118
info:
129
if: ${{ !startsWith(vars.ROLE, 'forgejo-') }}
@@ -41,9 +38,6 @@ jobs:
4138
git config user.name "Your Name"
4239
adduser --quiet --comment forgejo --disabled-password forgejo
4340
chown -R forgejo:forgejo .
44-
- name: merge feature branches
45-
run: |
46-
su forgejo -c 'set -ex ; for b in ${{ env.FEATURE_BRANCHES }} ; do git merge -m $b origin/forgejo-$b ; done'
4741
- uses: https://code.forgejo.org/actions/setup-go@v4
4842
with:
4943
go-version: "1.21"

0 commit comments

Comments
 (0)