pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[CI] cascade end-to-end must not try to merge feature branches

Browse source 
they no longer exist as of the hard fork
This commit is contained in:
Earl Warren 2024-02-10 10:45:10 +01:00
parent cf1c57b681
commit a4ca473d33
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.forgejo/workflows/cascade-setup-end-to-end.yml
View file

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