logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 394cb1e0f51de5ded6837dd882f0633f9791c11b
parent 9953b0da59924f936ecc646b22cd3e3a58493d6a
Author: feld <feld@feld.me>
Date:   Fri, 28 Jun 2024 13:20:46 +0000

Merge branch 'ci/elixir-1.16' into 'develop'

Ci/elixir 1.16

See merge request pleroma/pleroma!4162

Diffstat:

M.gitlab-ci.yml8++++----
Achangelog.d/ci-elixir-1.16.skip0
Aci/elixir-1.16.3-otp-26/Dockerfile8++++++++
Aci/elixir-1.16.3-otp-26/build_and_push.sh1+
4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml @@ -78,12 +78,12 @@ build-1.13.4-otp-25: script: - mix compile --force -build-1.15.8-otp-26: +build-1.16.3-otp-26: extends: - .build_changes_policy - .using-ci-base stage: build - image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15.8-otp-26 + image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.16.3-otp-26 script: - mix compile --force @@ -141,12 +141,12 @@ unit-testing-1.13.4-otp-25: coverage_format: cobertura path: coverage.xml -unit-testing-1.15.8-otp-26: +unit-testing-1.16.3-otp-26: extends: - .build_changes_policy - .using-ci-base stage: test - image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15.8-otp-26 + image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.16.3-otp-26 cache: *testing_cache_policy services: *testing_services script: *testing_script diff --git a/changelog.d/ci-elixir-1.16.skip b/changelog.d/ci-elixir-1.16.skip diff --git a/ci/elixir-1.16.3-otp-26/Dockerfile b/ci/elixir-1.16.3-otp-26/Dockerfile @@ -0,0 +1,8 @@ +FROM elixir:1.16.3-otp-26 + +# Single RUN statement, otherwise intermediate images are created +# https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run +RUN apt-get update &&\ + apt-get install -y libmagic-dev cmake libimage-exiftool-perl ffmpeg &&\ + mix local.hex --force &&\ + mix local.rebar --force diff --git a/ci/elixir-1.16.3-otp-26/build_and_push.sh b/ci/elixir-1.16.3-otp-26/build_and_push.sh @@ -0,0 +1 @@ +docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.16.3-otp-26 --push .