Merge remote-tracking branch 'upstream/develop' into oauth-token-id

This commit is contained in:
Alex Gleason 2021-04-29 14:06:12 -05:00
commit 6bc8ab225d
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7

View File

@ -24,6 +24,7 @@ stages:
- docker - docker
before_script: before_script:
- rm -rf _build/*/lib/pleroma
- apt-get update && apt-get install -y cmake - apt-get update && apt-get install -y cmake
- mix local.hex --force - mix local.hex --force
- mix local.rebar --force - mix local.rebar --force
@ -31,6 +32,9 @@ before_script:
- apt-get -qq update - apt-get -qq update
- apt-get install -y libmagic-dev - apt-get install -y libmagic-dev
after_script:
- rm -rf _build/*/lib/pleroma
build: build:
stage: build stage: build
script: script: