diff options
| author | lain <lain@soykaf.club> | 2023-12-11 09:09:25 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2023-12-11 09:09:25 +0000 |
| commit | 8d4a47bf9ede9bf5ce4d5165b82f76be51217da6 (patch) | |
| tree | f400daac009bb230df5bced5909f874ce990b722 | |
| parent | e7974afd3773c3610889845b6f2c5a78762f921e (diff) | |
| parent | 7cf65cfeea0a6e1a43028e55c974fa8e20b4d3ce (diff) | |
| download | pleroma-8d4a47bf9ede9bf5ce4d5165b82f76be51217da6.tar.gz pleroma-8d4a47bf9ede9bf5ce4d5165b82f76be51217da6.zip | |
Merge branch 'build-releases-with-provided-libvips-2' into 'develop'
Build releases with provided libvips 2
See merge request pleroma/pleroma!3992
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | changelog.d/build-release-with-local-libvips.skip | 0 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10a843af2..cc4dc0ff2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ image: git.pleroma.social:5050/pleroma/pleroma/ci-base variables: &global_variables + # Only used for the release ELIXIR_VER: 1.12.3 POSTGRES_DB: pleroma_test POSTGRES_USER: postgres @@ -319,8 +320,9 @@ amd64: - deps variables: &release-variables MIX_ENV: prod + VIX_COMPILATION_MODE: PLATFORM_PROVIDED_LIBVIPS before_script: &before-release - - apt-get update && apt-get install -y cmake libmagic-dev + - apt-get update && apt-get install -y cmake libmagic-dev libvips-dev erlang-dev - echo "import Config" > config/prod.secret.exs - mix local.hex --force - mix local.rebar --force @@ -341,7 +343,7 @@ amd64-musl: cache: *release-cache variables: *release-variables before_script: &before-release-musl - - apk add git build-base cmake file-dev openssl + - apk add git build-base cmake file-dev openssl vips-dev - echo "import Config" > config/prod.secret.exs - mix local.hex --force - mix local.rebar --force diff --git a/changelog.d/build-release-with-local-libvips.skip b/changelog.d/build-release-with-local-libvips.skip new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/changelog.d/build-release-with-local-libvips.skip |