projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
.gitlab-ci.yml
diff --git
a/.gitlab-ci.yml
b/.gitlab-ci.yml
index 2bc5719718d80d141536e14d7a5d9b32e17e457e..78e715d47396b3c7a6065cd0b7dbcb7d1980afb9 100644
(file)
--- a/
.gitlab-ci.yml
+++ b/
.gitlab-ci.yml
@@
-8,7
+8,9
@@
variables: &global_variables
MIX_ENV: test
cache: &global_cache_policy
MIX_ENV: test
cache: &global_cache_policy
- key: ${CI_COMMIT_REF_SLUG}
+ key:
+ files:
+ - mix.lock
paths:
- deps
- _build
paths:
- deps
- _build
@@
-22,6
+24,7
@@
stages:
- docker
before_script:
- docker
before_script:
+ - rm -rf _build/*/lib/pleroma
- apt-get update && apt-get install -y cmake
- mix local.hex --force
- mix local.rebar --force
- apt-get update && apt-get install -y cmake
- mix local.hex --force
- mix local.rebar --force
@@
-29,6
+32,9
@@
before_script:
- apt-get -qq update
- apt-get install -y libmagic-dev
- apt-get -qq update
- apt-get install -y libmagic-dev
+after_script:
+ - rm -rf _build/*/lib/pleroma
+
build:
stage: build
script:
build:
stage: build
script:
@@
-171,8
+177,8
@@
spec-deploy:
- apk add curl
script:
- curl -X POST -F"token=$API_DOCS_PIPELINE_TRIGGER" -F'ref=master' -F"variables[BRANCH]=$CI_COMMIT_REF_NAME" -F"variables[JOB_REF]=$CI_JOB_ID" https://git.pleroma.social/api/v4/projects/1130/trigger/pipeline
- apk add curl
script:
- curl -X POST -F"token=$API_DOCS_PIPELINE_TRIGGER" -F'ref=master' -F"variables[BRANCH]=$CI_COMMIT_REF_NAME" -F"variables[JOB_REF]=$CI_JOB_ID" https://git.pleroma.social/api/v4/projects/1130/trigger/pipeline
-
-
+
+
stop_review_app:
image: alpine:3.9
stage: deploy
stop_review_app:
image: alpine:3.9
stage: deploy
@@
-231,7
+237,7
@@
amd64-musl:
stage: release
artifacts: *release-artifacts
only: *release-only
stage: release
artifacts: *release-artifacts
only: *release-only
- image: elixir:1.10.3-alpine
+ image: elixir:1.10.3-alpine
cache: *release-cache
variables: *release-variables
before_script: &before-release-musl
cache: *release-cache
variables: *release-variables
before_script: &before-release-musl