try running federation tests in same alpine version

pull/1335/head
Felix Ableitner 2020-12-11 14:13:30 +01:00
parent 4fd6b5f5e1
commit df2ec0aa38
2 changed files with 2 additions and 4 deletions

View File

@ -51,8 +51,6 @@ steps:
- /dieselcli/diesel migration run - /dieselcli/diesel migration run
- cargo test --workspace --no-fail-fast - cargo test --workspace --no-fail-fast
# TODO: this uses rust 1.48.0, which doesnt work with config-rs, so federation tests fail
# https://github.com/LemmyNet/lemmy/issues/1270
- name: cargo build - name: cargo build
image: ekidd/rust-musl-builder:1.47.0 image: ekidd/rust-musl-builder:1.47.0
volumes: volumes:
@ -62,7 +60,7 @@ steps:
- cargo build - cargo build
- name: run federation tests - name: run federation tests
image: node:15-buster-slim image: node:15-alpine-3.12
commands: commands:
- apt-get update - apt-get update
- apt-get -y install --no-install-recommends bash curl postgresql-client - apt-get -y install --no-install-recommends bash curl postgresql-client

View File

@ -18,7 +18,7 @@ LEMMY_HOSTNAME=lemmy-alpha:8541 \
LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta,lemmy-gamma,lemmy-delta,lemmy-epsilon \ LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta,lemmy-gamma,lemmy-delta,lemmy-epsilon \
LEMMY_SETUP__ADMIN_USERNAME=lemmy_alpha \ LEMMY_SETUP__ADMIN_USERNAME=lemmy_alpha \
LEMMY_SETUP__SITE_NAME=lemmy-alpha \ LEMMY_SETUP__SITE_NAME=lemmy-alpha \
target/debug/lemmy_server & target/debug/lemmy_server
echo "start beta" echo "start beta"
LEMMY_HOSTNAME=lemmy-beta:8551 \ LEMMY_HOSTNAME=lemmy-beta:8551 \