From 9621caf6616e878d3ab07b8dcf0e49cc36762392 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 11 Oct 2021 18:46:16 +0200 Subject: [PATCH] Bump required version to Elixir 1.12 and remove legacy tests Drops support for OTP < 22 Signed-off-by: Thomas Citharel --- .gitlab-ci.yml | 18 ------------------ docker/tests/Dockerfile-legacy | 33 --------------------------------- mix.exs | 2 +- 3 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 docker/tests/Dockerfile-legacy diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 038cc4298..df71cd174 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -101,24 +101,6 @@ deps: needs: - install -exunit-1.11: - stage: test - image: tcitworld/mobilizon-ci:legacy - services: - - name: postgis/postgis:11-3.0 - alias: postgres - variables: - MIX_ENV: test - before_script: - - mix deps.clean --all - - mix deps.get - - mix tz_world.update - - mix ecto.create - - mix ecto.migrate - script: - - mix coveralls - allow_failure: true - exunit: stage: test services: diff --git a/docker/tests/Dockerfile-legacy b/docker/tests/Dockerfile-legacy deleted file mode 100644 index 870b38375..000000000 --- a/docker/tests/Dockerfile-legacy +++ /dev/null @@ -1,33 +0,0 @@ -# We build Elixir manually to have the oldest acceptable version of OTP -FROM erlang:21 -LABEL maintainer="Thomas Citharel " - -# elixir expects utf8. -ENV ELIXIR_VERSION="v1.11.4" \ - LANG=C.UTF-8 - -RUN set -xe \ - && ELIXIR_DOWNLOAD_URL="https://github.com/elixir-lang/elixir/archive/${ELIXIR_VERSION}.tar.gz" \ - && ELIXIR_DOWNLOAD_SHA256="85c7118a0db6007507313db5bddf370216d9394ed7911fe80f21e2fbf7f54d29" \ - && curl -fSL -o elixir-src.tar.gz $ELIXIR_DOWNLOAD_URL \ - && echo "$ELIXIR_DOWNLOAD_SHA256 elixir-src.tar.gz" | sha256sum -c - \ - && mkdir -p /usr/local/src/elixir \ - && tar -xzC /usr/local/src/elixir --strip-components=1 -f elixir-src.tar.gz \ - && rm elixir-src.tar.gz \ - && cd /usr/local/src/elixir \ - && make install clean - -CMD ["iex"] - -ENV REFRESHED_AT=2021-10-11 -RUN apt-get update -yq && apt-get install -yq build-essential inotify-tools postgresql-client git curl gnupg xvfb libgtk-3-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 cmake exiftool python3-pip python3-setuptools -RUN curl -sL https://deb.nodesource.com/setup_12.x | bash && apt-get install nodejs -yq -RUN npm install -g yarn wait-on -RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -RUN mix local.hex --force && mix local.rebar --force -# Weasyprint 53 requires pango >= 1.44.0, which is not available in Stretch. -# TODO: Remove the version requirement when elixir:latest is based on Bullseye -# https://github.com/erlang/docker-erlang-otp/issues/362 -# https://github.com/Kozea/WeasyPrint/issues/1384 -RUN pip3 install -Iv weasyprint==52 pyexcel_ods3 -RUN curl https://dbip.mirror.framasoft.org/files/dbip-city-lite-latest.mmdb --output GeoLite2-City.mmdb -s && mkdir -p /usr/share/GeoIP && mv GeoLite2-City.mmdb /usr/share/GeoIP/ diff --git a/mix.exs b/mix.exs index c1cb4d56f..555f0b984 100644 --- a/mix.exs +++ b/mix.exs @@ -7,7 +7,7 @@ defmodule Mobilizon.Mixfile do [ app: :mobilizon, version: @version, - elixir: "~> 1.11", + elixir: "~> 1.12", elixirc_paths: elixirc_paths(Mix.env()), compilers: [:gettext] ++ Mix.compilers(), xref: [exclude: [:eldap]],