projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
[akkoma]
/
.gitlab-ci.yml
diff --git
a/.gitlab-ci.yml
b/.gitlab-ci.yml
index 1b7c03ebb9e235cfc9470ac42d69df93c8028973..5c12647a00f2b6afce42f9a5f0456f7fd962637a 100644
(file)
--- a/
.gitlab-ci.yml
+++ b/
.gitlab-ci.yml
@@
-1,4
+1,4
@@
-image: elixir:1.
8.1
+image: elixir:1.
9.4
variables: &global_variables
POSTGRES_DB: pleroma_test
variables: &global_variables
POSTGRES_DB: pleroma_test
@@
-6,6
+6,8
@@
variables: &global_variables
POSTGRES_PASSWORD: postgres
DB_HOST: postgres
MIX_ENV: test
POSTGRES_PASSWORD: postgres
DB_HOST: postgres
MIX_ENV: test
+ SHELL: /bin/sh
+ USER: root
cache: &global_cache_policy
key: ${CI_COMMIT_REF_SLUG}
cache: &global_cache_policy
key: ${CI_COMMIT_REF_SLUG}
@@
-48,6
+50,7
@@
benchmark:
unit-testing:
stage: test
unit-testing:
stage: test
+ retry: 2
cache: &testing_cache_policy
<<: *global_cache_policy
policy: pull
cache: &testing_cache_policy
<<: *global_cache_policy
policy: pull
@@
-80,6
+83,7
@@
unit-testing:
unit-testing-rum:
stage: test
unit-testing-rum:
stage: test
+ retry: 2
cache: *testing_cache_policy
services:
- name: minibikini/postgres-with-rum:12
cache: *testing_cache_policy
services:
- name: minibikini/postgres-with-rum:12
@@
-168,8
+172,7
@@
stop_review_app:
amd64:
stage: release
amd64:
stage: release
- # TODO: Replace with upstream image when 1.9.0 comes out
- image: rinpatch/elixir:1.9.0-rc.0
+ image: elixir:1.10.3
only: &release-only
- stable@pleroma/pleroma
- develop@pleroma/pleroma
only: &release-only
- stable@pleroma/pleroma
- develop@pleroma/pleroma
@@
-206,8
+209,7
@@
amd64-musl:
stage: release
artifacts: *release-artifacts
only: *release-only
stage: release
artifacts: *release-artifacts
only: *release-only
- # TODO: Replace with upstream image when 1.9.0 comes out
- image: rinpatch/elixir:1.9.0-rc.0-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
@@
-223,8
+225,7
@@
arm:
only: *release-only
tags:
- arm32
only: *release-only
tags:
- arm32
- # TODO: Replace with upstream image when 1.9.0 comes out
- image: rinpatch/elixir:1.9.0-rc.0-arm
+ image: elixir:1.10.3
cache: *release-cache
variables: *release-variables
before_script: *before-release
cache: *release-cache
variables: *release-variables
before_script: *before-release
@@
-236,8
+237,7
@@
arm-musl:
only: *release-only
tags:
- arm32
only: *release-only
tags:
- arm32
- # TODO: Replace with upstream image when 1.9.0 comes out
- image: rinpatch/elixir:1.9.0-rc.0-arm-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
@@
-249,8
+249,7
@@
arm64:
only: *release-only
tags:
- arm
only: *release-only
tags:
- arm
- # TODO: Replace with upstream image when 1.9.0 comes out
- image: rinpatch/elixir:1.9.0-rc.0-arm64
+ image: elixir:1.10.3
cache: *release-cache
variables: *release-variables
before_script: *before-release
cache: *release-cache
variables: *release-variables
before_script: *before-release
@@
-263,7
+262,7
@@
arm64-musl:
tags:
- arm
# TODO: Replace with upstream image when 1.9.0 comes out
tags:
- arm
# TODO: Replace with upstream image when 1.9.0 comes out
- image:
rinpatch/elixir:1.9.0-rc.0-arm64
-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