MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into pre-release/1.3.0

This commit is contained in:
Georg Krause 2023-01-23 14:22:10 +01:00
parent 0729b52f3d 6b469ba1d8
commit 81e904b254
No known key found for this signature in database
GPG Key ID: 2970D504B2183D22
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci.yml
View File

@ -26,7 +26,10 @@ workflow:
# Run for any event on the default branches in the funkwhale namespace # Run for any event on the default branches in the funkwhale namespace
- if: > - if: >
$CI_PROJECT_NAMESPACE == "funkwhale" && $CI_PROJECT_NAMESPACE == "funkwhale" &&
$CI_COMMIT_BRANCH =~ /(stable|develop)/ (
$CI_COMMIT_BRANCH =~ /(stable|develop)/ ||
$CI_COMMIT_TAG
)
# Run for merge requests from any repo or branches # Run for merge requests from any repo or branches
- if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_PIPELINE_SOURCE == "merge_request_event"