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