Compare commits
2 commits
24bf8c3977
...
2abf8c982e
Author | SHA1 | Date | |
---|---|---|---|
2abf8c982e | |||
1b3de39996 |
3 changed files with 59 additions and 14 deletions
|
@ -1,18 +1,13 @@
|
||||||
depends_on:
|
depends_on:
|
||||||
- test
|
- test
|
||||||
|
|
||||||
when:
|
|
||||||
event: deployment
|
|
||||||
|
|
||||||
matrix:
|
|
||||||
platform:
|
|
||||||
- amd64
|
|
||||||
- arm64
|
|
||||||
|
|
||||||
platform: linux/${platform}
|
|
||||||
|
|
||||||
pipeline:
|
pipeline:
|
||||||
${platform}-glibc:
|
|
||||||
|
amd64-glibc:
|
||||||
|
when:
|
||||||
|
event:
|
||||||
|
- deployment
|
||||||
|
|
||||||
group: release
|
group: release
|
||||||
image: elixir:1.13
|
image: elixir:1.13
|
||||||
environment:
|
environment:
|
||||||
|
@ -31,7 +26,11 @@ pipeline:
|
||||||
- zip akkoma-$CI_COMMIT_BRANCH-${platform}.zip -r release
|
- zip akkoma-$CI_COMMIT_BRANCH-${platform}.zip -r release
|
||||||
- rclone copy akkoma-$CI_COMMIT_BRANCH-${platform}.zip scaleway:akkoma-updates/
|
- rclone copy akkoma-$CI_COMMIT_BRANCH-${platform}.zip scaleway:akkoma-updates/
|
||||||
|
|
||||||
${platform}-musl:
|
amd64-musl:
|
||||||
|
when:
|
||||||
|
event:
|
||||||
|
- deployment
|
||||||
|
|
||||||
group: release
|
group: release
|
||||||
image: elixir:1.13-alpine
|
image: elixir:1.13-alpine
|
||||||
environment:
|
environment:
|
||||||
|
@ -49,3 +48,49 @@ pipeline:
|
||||||
- mix release --path release
|
- mix release --path release
|
||||||
- zip akkoma-$CI_COMMIT_BRANCH-${platform}.zip -r release
|
- zip akkoma-$CI_COMMIT_BRANCH-${platform}.zip -r release
|
||||||
- rclone copy akkoma-$CI_COMMIT_BRANCH-${platform}.zip scaleway:akkoma-updates/
|
- rclone copy akkoma-$CI_COMMIT_BRANCH-${platform}.zip scaleway:akkoma-updates/
|
||||||
|
|
||||||
|
arm64-glibc:
|
||||||
|
when:
|
||||||
|
event:
|
||||||
|
- deployment
|
||||||
|
|
||||||
|
group: release
|
||||||
|
image: arm64v8/elixir:1.13
|
||||||
|
environment:
|
||||||
|
MIX_ENV: prod
|
||||||
|
commands:
|
||||||
|
- apt-get update && apt-get install -y cmake libmagic-dev rclone
|
||||||
|
- 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
|
||||||
|
- echo "import Mix.Config" > config/prod.secret.exs
|
||||||
|
- mix deps.get --only prod
|
||||||
|
- mkdir release
|
||||||
|
- export PLEROMA_BUILD_BRANCH=$CI_COMMIT_BRANCH
|
||||||
|
- mix release --path release
|
||||||
|
- zip akkoma-$CI_COMMIT_BRANCH-${platform}.zip -r release
|
||||||
|
- rclone copy akkoma-$CI_COMMIT_BRANCH-${platform}.zip scaleway:akkoma-updates/
|
||||||
|
|
||||||
|
arm64-musl:
|
||||||
|
when:
|
||||||
|
event:
|
||||||
|
- deployment
|
||||||
|
|
||||||
|
group: release
|
||||||
|
image: arm64v8/elixir:1.13-alpine
|
||||||
|
environment:
|
||||||
|
MIX_ENV: prod
|
||||||
|
commands:
|
||||||
|
- apk add git gcc g++ musl-dev make cmake file-dev rclone wget
|
||||||
|
- 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
|
||||||
|
- echo "import Mix.Config" > config/prod.secret.exs
|
||||||
|
- mix deps.get --only prod
|
||||||
|
- mkdir release
|
||||||
|
- export PLEROMA_BUILD_BRANCH=${CI_COMMIT_BRANCH}
|
||||||
|
- mix release --path release
|
||||||
|
- zip akkoma-$CI_COMMIT_BRANCH-${platform}.zip -r release
|
||||||
|
- rclone copy akkoma-$CI_COMMIT_BRANCH-${platform}.zip scaleway:akkoma-updates/
|
||||||
|
|
|
@ -271,7 +271,7 @@ def unreact_with_emoji(id, user, emoji) do
|
||||||
{:ok, activity, _} <- Pipeline.common_pipeline(undo, local: true) do
|
{:ok, activity, _} <- Pipeline.common_pipeline(undo, local: true) do
|
||||||
{:ok, activity}
|
{:ok, activity}
|
||||||
else
|
else
|
||||||
e ->
|
_ ->
|
||||||
{:error, dgettext("errors", "Could not remove reaction emoji")}
|
{:error, dgettext("errors", "Could not remove reaction emoji")}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -144,7 +144,7 @@ test "video attachments have image thumbnail with WxH metadata with Preview Prox
|
||||||
[
|
[
|
||||||
property: "og:image",
|
property: "og:image",
|
||||||
content:
|
content:
|
||||||
"http://localhost:4001/proxy/preview/FElXD3PfapZSKq-u62Dc3BiaIM8/aHR0cHM6Ly9wbGVyb21hLmdvdi9hYm91dC9qdWNoZS53ZWJt/juche.webm"
|
"http://localhost:4001/proxy/preview/LzAnlke-l5oZbNzWsrHfprX1rGw/aHR0cHM6Ly9wbGVyb21hLmdvdi9hYm91dC9qdWNoZS53ZWJt/juche.webm"
|
||||||
], []} in result
|
], []} in result
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue