projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'finch' of git.pleroma.social:pleroma/pleroma into finch
[akkoma]
/
.gitlab-ci.yml
diff --git
a/.gitlab-ci.yml
b/.gitlab-ci.yml
index 9041443c5b6b46ae0140a2df19aaa9dc8ec8afce..f296f7bd9ab67bac88823a8c8efe4d3f5083876a 100644
(file)
--- a/
.gitlab-ci.yml
+++ b/
.gitlab-ci.yml
@@
-79,7
+79,6
@@
unit-testing:
- "**/*.ex"
- "**/*.exs"
- "mix.lock"
- "**/*.ex"
- "**/*.exs"
- "mix.lock"
- retry: 2
cache: &testing_cache_policy
<<: *global_cache_policy
policy: pull
cache: &testing_cache_policy
<<: *global_cache_policy
policy: pull
@@
-117,7
+116,6
@@
unit-testing-rum:
- "**/*.ex"
- "**/*.exs"
- "mix.lock"
- "**/*.ex"
- "**/*.exs"
- "mix.lock"
- retry: 2
cache: *testing_cache_policy
services:
- name: minibikini/postgres-with-rum:12
cache: *testing_cache_policy
services:
- name: minibikini/postgres-with-rum:12
@@
-244,7
+242,7
@@
stop_review_app:
amd64:
stage: release
amd64:
stage: release
- image: elixir:1.10.
3
+ image: elixir:1.10.
4
only: &release-only
- stable@pleroma/pleroma
- develop@pleroma/pleroma
only: &release-only
- stable@pleroma/pleroma
- develop@pleroma/pleroma
@@
-282,7
+280,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.
4
-alpine
cache: *release-cache
variables: *release-variables
before_script: &before-release-musl
cache: *release-cache
variables: *release-variables
before_script: &before-release-musl
@@
-298,7
+296,7
@@
arm:
only: *release-only
tags:
- arm32-specified
only: *release-only
tags:
- arm32-specified
- image: arm32v7/elixir:1.10.
3
+ image: arm32v7/elixir:1.10.
4
cache: *release-cache
variables: *release-variables
before_script: *before-release
cache: *release-cache
variables: *release-variables
before_script: *before-release
@@
-310,7
+308,7
@@
arm-musl:
only: *release-only
tags:
- arm32-specified
only: *release-only
tags:
- arm32-specified
- image: arm32v7/elixir:1.10.
3
-alpine
+ image: arm32v7/elixir:1.10.
4
-alpine
cache: *release-cache
variables: *release-variables
before_script: *before-release-musl
cache: *release-cache
variables: *release-variables
before_script: *before-release-musl
@@
-322,7
+320,7
@@
arm64:
only: *release-only
tags:
- arm
only: *release-only
tags:
- arm
- image: arm64v8/elixir:1.10.
3
+ image: arm64v8/elixir:1.10.
4
cache: *release-cache
variables: *release-variables
before_script: *before-release
cache: *release-cache
variables: *release-variables
before_script: *before-release
@@
-334,7
+332,7
@@
arm64-musl:
only: *release-only
tags:
- arm
only: *release-only
tags:
- arm
- image: arm64v8/elixir:1.10.
3
-alpine
+ image: arm64v8/elixir:1.10.
4
-alpine
cache: *release-cache
variables: *release-variables
before_script: *before-release-musl
cache: *release-cache
variables: *release-variables
before_script: *before-release-musl