bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'default-branch-fix' into 'develop'

Browse source 
GitLab CI: fix default branch rules

See merge request soapbox-pub/soapbox!2103
This commit is contained in:
Alex Gleason 2023-01-01 06:17:17 +00:00
commit d842c187fb
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
.gitlab-ci.yml
View file

@ -36,8 +36,8 @@ danger:
- export CI_MERGE_REQUEST_IID=${CI_OPEN_MERGE_REQUESTS#*!} - export CI_MERGE_REQUEST_IID=${CI_OPEN_MERGE_REQUESTS#*!}
- npx danger ci - npx danger ci
except: except:
refs: variables:
- $CI_DEFAULT_BRANCH - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
allow_failure: true allow_failure: true
lint-js: lint-js:
@ -115,8 +115,8 @@ docs-deploy:
script: script:
- curl -X POST -F"token=$CI_JOB_TOKEN" -F'ref=master' https://gitlab.com/api/v4/projects/15685485/trigger/pipeline - curl -X POST -F"token=$CI_JOB_TOKEN" -F'ref=master' https://gitlab.com/api/v4/projects/15685485/trigger/pipeline
only: only:
refs: variables:
- $CI_DEFAULT_BRANCH - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
changes: changes:
- "docs/**/*" - "docs/**/*"
@ -141,8 +141,8 @@ pages:
paths: paths:
- public - public
only: only:
refs: variables:
- $CI_DEFAULT_BRANCH - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
docker: docker:
stage: deploy stage: deploy
@ -157,8 +157,8 @@ docker:
- docker build -t $CI_REGISTRY_IMAGE . - docker build -t $CI_REGISTRY_IMAGE .
- docker push $CI_REGISTRY_IMAGE - docker push $CI_REGISTRY_IMAGE
only: only:
refs: variables:
- $CI_DEFAULT_BRANCH - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
include: include:
- template: Jobs/Dependency-Scanning.gitlab-ci.yml - template: Jobs/Dependency-Scanning.gitlab-ci.yml