From 7ba8766cf6dd763b31525c3adc1f58094d1bc58f Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Thu, 14 Jul 2022 10:57:09 +0100 Subject: [PATCH 1/5] support musl1.1 --- .woodpecker/.release.yml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/.woodpecker/.release.yml b/.woodpecker/.release.yml index 899027e2d..40843f29e 100644 --- a/.woodpecker/.release.yml +++ b/.woodpecker/.release.yml @@ -76,3 +76,41 @@ pipeline: - export PLEROMA_BUILD_BRANCH=develop - zip akkoma-${tag}.zip -r release - rclone copyto akkoma-${tag}.zip scaleway:akkoma-updates/develop/akkoma-${tag}-musl.zip + + musl1.1: + when: + event: + - push + branch: + - void-fix + secrets: + - SCW_ACCESS_KEY + - SCW_SECRET_KEY + - SCW_DEFAULT_ORGANIZATION_ID + group: release + image: voidlinux/voidlinux-musl + environment: + MIX_ENV: prod + commands: + - xbps-install -Suy + - xbps-install -uy xbps + - xbps-install -Suy + - xbps-install -y git gcc musl-devel make cmake file-devel rclone wget zip libmagic elixir + - rm -rf release || true + - rm -rf _build || true + - rm -rf /root/.mix + - rm scaleway-cli || true + - wget https://github.com/scaleway/scaleway-cli/releases/download/v2.5.1/scaleway-cli_2.5.1_linux_amd64 + - mv scaleway-cli_2.5.1_linux_amd64 scaleway-cli + - chmod +x scaleway-cli + - ./scaleway-cli object config install type=rclone + + - mix local.hex --force + - mix local.rebar --force + - mix deps.clean --all + - mix deps.get --only prod + - mix release --path release + - export PLEROMA_BUILD_BRANCH=develop + - zip akkoma-${tag}.zip -r release + - rclone copyto akkoma-${tag}.zip scaleway:akkoma-updates/develop/akkoma-${tag}-musl11.zip + -- 2.43.0 From 0cc7ffef4b380c27e0b97192fc56768a7306d703 Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Thu, 14 Jul 2022 11:18:29 +0100 Subject: [PATCH 2/5] build for musl11 --- .woodpecker/.release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.woodpecker/.release.yml b/.woodpecker/.release.yml index 40843f29e..442074c9f 100644 --- a/.woodpecker/.release.yml +++ b/.woodpecker/.release.yml @@ -113,4 +113,3 @@ pipeline: - export PLEROMA_BUILD_BRANCH=develop - zip akkoma-${tag}.zip -r release - rclone copyto akkoma-${tag}.zip scaleway:akkoma-updates/develop/akkoma-${tag}-musl11.zip - -- 2.43.0 From 48670049d40a28c1d696e4dfe116d4a6aa82d08e Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Thu, 14 Jul 2022 11:20:13 +0100 Subject: [PATCH 3/5] force xpbs update --- .woodpecker/.release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.woodpecker/.release.yml b/.woodpecker/.release.yml index 442074c9f..0dc80bc19 100644 --- a/.woodpecker/.release.yml +++ b/.woodpecker/.release.yml @@ -92,8 +92,7 @@ pipeline: environment: MIX_ENV: prod commands: - - xbps-install -Suy - - xbps-install -uy xbps + - xbps-install -Suy || xbps-install -uy xbps - xbps-install -Suy - xbps-install -y git gcc musl-devel make cmake file-devel rclone wget zip libmagic elixir - rm -rf release || true -- 2.43.0 From 04c1f9d77b75bae423ec74884d5254d9944c6cbb Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Thu, 14 Jul 2022 11:58:29 +0100 Subject: [PATCH 4/5] document void changes --- .woodpecker/.release.yml | 2 +- docs/administration/updating.md | 2 +- docs/installation/migrating_to_akkoma.md | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.release.yml b/.woodpecker/.release.yml index 0dc80bc19..5efef118f 100644 --- a/.woodpecker/.release.yml +++ b/.woodpecker/.release.yml @@ -82,7 +82,7 @@ pipeline: event: - push branch: - - void-fix + - develop secrets: - SCW_ACCESS_KEY - SCW_SECRET_KEY diff --git a/docs/administration/updating.md b/docs/administration/updating.md index d7d30c926..7c2cd2a16 100644 --- a/docs/administration/updating.md +++ b/docs/administration/updating.md @@ -8,7 +8,7 @@ Besides that, doing the following is generally enough: ```sh # Download the new release -su akkoma -s $SHELL -lc "./bin/pleroma_ctl update" +su akkoma -s $SHELL -lc "./bin/pleroma_ctl update --branch develop" # Migrate the database, you are advised to stop the instance before doing that su akkoma -s $SHELL -lc "./bin/pleroma_ctl migrate" diff --git a/docs/installation/migrating_to_akkoma.md b/docs/installation/migrating_to_akkoma.md index 698e054f1..181f6dae6 100644 --- a/docs/installation/migrating_to_akkoma.md +++ b/docs/installation/migrating_to_akkoma.md @@ -36,6 +36,12 @@ Then compile, migrate and restart as usual. ## From OTP +**IMPORTANT: if you are using musl1.1 (void linux musl edition), +you will need to override the FLAVOUR to amd64-musl11, +also pls go shout at your maintainers to actually upgrade from EOL software.** + +the flavour to be + This will just be setting the update URL - ```bash -- 2.43.0 From 0e17a397abe25412cb7ac0da6af806e6b18175cf Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Thu, 14 Jul 2022 11:58:44 +0100 Subject: [PATCH 5/5] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f8aed02f..131453a12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Added move account API - Added ability to set instance accent-color via theme-color - A fallback page for when a user does not have a frontend installed +- Support for OTP musl11 ### Removed - SSH frontend, to be potentially re-enabled via a bridge rather than wired into the main system -- 2.43.0