From df2ec0aa38f4498d6f9f5f944bc533caf08ab32f Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Fri, 11 Dec 2020 14:13:30 +0100 Subject: [PATCH] try running federation tests in same alpine version --- .drone.yml | 4 +--- api_tests/prepare-drone-federation-test.sh | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index c2b1797c..bf3c301e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -51,8 +51,6 @@ steps: - /dieselcli/diesel migration run - 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 image: ekidd/rust-musl-builder:1.47.0 volumes: @@ -62,7 +60,7 @@ steps: - cargo build - name: run federation tests - image: node:15-buster-slim + image: node:15-alpine-3.12 commands: - apt-get update - apt-get -y install --no-install-recommends bash curl postgresql-client diff --git a/api_tests/prepare-drone-federation-test.sh b/api_tests/prepare-drone-federation-test.sh index 9e0328a9..5a54cd3a 100755 --- a/api_tests/prepare-drone-federation-test.sh +++ b/api_tests/prepare-drone-federation-test.sh @@ -18,7 +18,7 @@ LEMMY_HOSTNAME=lemmy-alpha:8541 \ LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta,lemmy-gamma,lemmy-delta,lemmy-epsilon \ LEMMY_SETUP__ADMIN_USERNAME=lemmy_alpha \ LEMMY_SETUP__SITE_NAME=lemmy-alpha \ - target/debug/lemmy_server & + target/debug/lemmy_server echo "start beta" LEMMY_HOSTNAME=lemmy-beta:8551 \ -- 2.44.1