From ad68d4cdc2424c5bb03b05faae831b3992e49279 Mon Sep 17 00:00:00 2001
From: Luke Hoersten <luke@hoersten.org>
Date: Thu, 30 Jul 2026 20:24:28 -0500
Subject: pleroma/build: install elixir from apt

26.04 ships elixir 1.18.3, the exact version the role pinned from
upstream zips, so the download/unarchive tasks and version vars go
away. Resolves the TODO waiting on this release.
---
 pleroma/build/defaults/main.yaml |  2 --
 pleroma/build/tasks/main.yaml    | 20 ++------------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/pleroma/build/defaults/main.yaml b/pleroma/build/defaults/main.yaml
index bc9be00..4687c33 100644
--- a/pleroma/build/defaults/main.yaml
+++ b/pleroma/build/defaults/main.yaml
@@ -1,8 +1,6 @@
 ---
 
 pleroma_version: "2.10.0"
-pleroma_elixir_version: "1.18.3"
-pleroma_erlang_otp_version: "25"
 # https://git.pleroma.social/pleroma/pleroma/releases
 pleroma_tar: "https://git.pleroma.social/pleroma/pleroma/archive/v{{pleroma_version}}.tar.gz"
 pleroma_build_dir: "{{build_work_dir}}/pleroma"
diff --git a/pleroma/build/tasks/main.yaml b/pleroma/build/tasks/main.yaml
index 200b215..33d58ad 100644
--- a/pleroma/build/tasks/main.yaml
+++ b/pleroma/build/tasks/main.yaml
@@ -9,35 +9,19 @@
     group: "{{ansible_user}}"
     mode: "0755"
 
+# 26.04 ships elixir 1.15+, new enough for Pleroma; no more upstream zips.
 - name: install elixir build dependencies
   become: yes
   apt:
     name:
       - erlang
       - erlang-dev
+      - elixir
       - build-essential
       - cmake
       - libmagic-dev
       - libvips-dev
 
-# TODO: Ubuntu Noble (24.04) only ships Elixir 1.14, which is too old for Pleroma.
-# When the next Ubuntu LTS (26.04) is available, check if elixir >=1.15 is in the
-# official repos and replace the two tasks below with a simple apt install.
-- name: download elixir release
-  become: yes
-  get_url:
-    url: "https://github.com/elixir-lang/elixir/releases/download/v{{pleroma_elixir_version}}/elixir-otp-{{pleroma_erlang_otp_version}}.zip"
-    dest: "{{build_work_dir}}/elixir-{{pleroma_elixir_version}}.zip"
-    force: false
-
-- name: install elixir
-  become: yes
-  unarchive:
-    remote_src: yes
-    src: "{{build_work_dir}}/elixir-{{pleroma_elixir_version}}.zip"
-    dest: "/usr/local"
-    creates: "/usr/local/bin/elixir"
-
 - name: install hex package manager
   command: mix local.hex --force
   # Keep the mix/hex caches on build_work_dir (the SSD) instead of the SD card.
-- 
cgit v1.2.3