Ivan Tashkinov
bdf57b8ef4
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# mix.lock
# test/web/media_proxy/media_proxy_test.exs
2020-07-19 20:05:37 +03:00
Mark Felder
6167593881
Support Exiftool for stripping EXIF data
...
We really only want to strip location data anyway, and mogrify strips color profiles.
2020-07-10 16:46:26 -05:00
stwf
af9eb7a2b1
re-enable federation tests
2020-07-08 11:32:04 -04:00
Ivan Tashkinov
61180ab6f4
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
2020-07-02 16:36:54 +03:00
rinpatch
55d8263c00
Update OTP releases to official images of 1.10.3
...
This is necessary since we bumped required version of elixir to 1.9.
The dlsym bug should be gone by now.
2020-06-17 02:27:28 +03:00
Steven Fuchs
aca6a7543a
Upgrade to Elixir 1.9
2020-06-16 13:18:29 +00:00
Ivan Tashkinov
0e23138b50
[ #2497 ] Specified SHELL in .gitlab-ci.yml as required for exexec
.
2020-05-22 10:35:48 +03:00
Ivan Tashkinov
3a1e810aaa
[ #2497 ] Customized exexec
launch to support root operation (currently required by Gitlab CI).
2020-05-21 21:47:32 +03:00
lain
2f2e5fea34
Give up for now and make gitlab retry failed jobs.
2020-05-12 15:02:37 +02:00
jp
bcaaba4660
remove testing only:
in docker build
2020-03-31 22:16:36 -04:00
jp
c2715ed772
add imagemagick and update inherited container to alpine:3.11
2020-03-31 21:31:23 -04:00
Mark Felder
d3cd3b96bf
Remove problematic --cache-from argument
2020-03-31 17:28:41 -05:00
stwf
a8c6933ca0
remove federated testing
2020-03-19 12:27:09 -04:00
jp
1e17ad2275
Update docker release / stable jobs
2020-01-15 17:25:33 -05:00
jp
ffab411327
Update docker jobs for release branches and stable branches
2020-01-15 16:54:53 -05:00
jp
0c9499bf25
Fix only: on docker develop/latest job
2020-01-15 16:41:41 -05:00
jp
4d19f38753
update only:
for release/ branch regex matching. and to avoid running image builds on unnecessary forks
2020-01-15 16:23:43 -05:00
jp
cc4c3255fe
Fix odd spacing
2020-01-15 16:16:29 -05:00
jp
a58a0a7b1b
Remove forked test branch matching
2020-01-14 13:47:36 -05:00
jp
ff15d6ef13
Remove artifacts passing by setting dependencies: []
2020-01-14 13:45:47 -05:00
jp
964d188a96
Add allow_failure to docker jobs
2020-01-14 12:43:28 -05:00
jp
fe57e5139f
Remove cache from docker jobs. Split devlop and stable branches into their own jobs
2020-01-14 12:32:36 -05:00
jp
2ef8f0be6c
Update Dockerfile with labels. Update gitlab-ci for registry usage
2020-01-10 14:09:14 -05:00
rinpatch
407449158f
CI: Add a cache policy for test jobs and fix rum tests recompiling
...
everything
2019-12-17 18:24:16 +03:00
rinpatch
ca1acfa314
Merge branch 'chore/manual-benchmark' into 'develop'
...
CI: Make benchmarks manually triggered.
See merge request pleroma/pleroma!2020
2019-11-28 17:46:23 +00:00
Egor Kislitsyn
798aa0c335
Use PosgreSQL v12 in the federated tests
2019-11-28 23:08:13 +07:00
lain
9a2d38107c
CI: Make benchmarks manually triggered.
2019-11-28 15:14:11 +01:00
lain
bbec9bb727
Tests: Run the daemon
2019-11-26 15:03:17 -05:00
lain
74aa42998f
CI: Add testing stage for federated tests.
2019-11-26 15:03:16 -05:00
rinpatch
2861f97e46
ci: disable --trace for unit tests
...
it is mostly useless, but makes failures harder to find
2019-11-14 16:06:08 +03:00
lain
55ac38c1d2
Merge branch 'fix-dokku-2' into 'develop'
...
Dokku deploys: Keep the git dir so version number generation works.
See merge request pleroma/pleroma!1967
2019-11-11 15:01:31 +00:00
Egor Kislitsyn
7ba30cf8b6
Use PG12 in CI for the RUM pipeline
2019-11-11 19:47:33 +07:00
lain
86d821a96e
Dokku deploys: Keep the git dir so version number generation works.
2019-11-11 13:37:56 +01:00
rinpatch
d5dc0c4a7e
CI: Remove the docs-build job
...
The artifacts it produces were no longer used since we switched to
mkdocs.
2019-11-05 23:45:07 +03:00
lain
6977cddff9
Merge branch 'benchmark-finishing' into 'develop'
...
Benchmark finishing
Closes #755
See merge request pleroma/pleroma!1848
2019-10-16 11:54:49 +00:00
rinpatch
0e9243e8a2
Preparations for renaming master
to stable
2019-10-14 18:38:51 +03:00
lain
b9b00e6e96
Gitlab CI: Run correct benchmark task.
2019-10-10 15:31:32 +02:00
lain
c54ae662dc
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
2019-10-10 14:40:59 +02:00
lain
02f8e2a8ab
Gitlab: Run benchmark in CI.
2019-10-10 14:24:54 +02:00
rinpatch
b2f2012a4f
Remove a test branch from CI
2019-10-03 18:42:02 +03:00
rinpatch
b5a43e301e
Change docs build/deploy to just trigger a pipeline in the docs repo
2019-10-03 15:02:21 +03:00
rinpatch
7131580058
CI: Enable OTP release building for maint/* branches
2019-09-30 18:23:29 +03:00
rinpatch
bdc1592377
Add PLEROMA_BUILD_ENV to override env for the version generator and use it in the CI for building docs
...
This is needed because if we run with MIX_ENV=dev we will get a "+dev"
suffix to the version in the docs, but if we run with MIX_ENV=prod the
docs build will fail because ex_doc is dev-only dependency.
2019-06-29 14:28:26 +03:00
rinpatch
0f6e333d8b
Revert "Build releases only on tags or develop"
...
This reverts commit 54d287377054fa48c5a14cf6b056cd80e838b264.
2019-06-29 13:29:11 +03:00
rinpatch
ee79c67081
Build releases only on tags or develop
...
Needed so we could push documentation updates to master without
triggering a rebuild
2019-06-29 12:29:12 +03:00
rinpatch
4974988f03
Export PLEROMA_BUILD_BRANCH
2019-06-20 11:02:05 +03:00
rinpatch
a6e3169cfc
Make possible to override the branch name via a env variable
...
This is useful for the CI builds because they have a detached HEAD or
for emulating a feature that is availible only on a particular branch
(e.g pleroma_ctl downloads CI artifacts only for develop and master)
2019-06-19 14:40:39 +03:00
rinpatch
8fbe1a3b92
remove the feature branch from only
2019-06-13 22:31:15 +03:00
rinpatch
fc4a8026d8
Remove a TODO
2019-06-13 21:23:37 +03:00
rinpatch
6426aefb16
Expire artifacts in 42 years
2019-06-13 18:24:39 +03:00