From ae635c752aaa0d11d3cb317c612180a835aa65f2 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 19 Mar 2021 15:57:56 -0400 Subject: [PATCH 1/2] Try to remove cargo home changing to fix release. --- .drone.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5c68e2ccb..bb27984f9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,13 +21,7 @@ steps: - name: cargo clippy image: ekidd/rust-musl-builder:1.50.0 - environment: - CARGO_HOME: /drone/src/.cargo commands: - - whoami - - ls -la ~/.cargo - - mv ~/.cargo . - - ls -la .cargo - cargo clippy --workspace --tests --all-targets --all-features -- -D warnings -D deprecated -D clippy::perf -D clippy::complexity -D clippy::dbg_macro - cargo clippy --workspace -- -D clippy::unwrap_used @@ -37,7 +31,6 @@ steps: LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy RUST_BACKTRACE: 1 RUST_TEST_THREADS: 1 - CARGO_HOME: /drone/src/.cargo commands: - sudo apt-get update - sudo apt-get -y install --no-install-recommends espeak postgresql-client @@ -45,8 +38,6 @@ steps: - name: cargo build image: ekidd/rust-musl-builder:1.50.0 - environment: - CARGO_HOME: /drone/src/.cargo commands: - cargo build - mv target/x86_64-unknown-linux-musl/debug/lemmy_server target/lemmy_server @@ -118,7 +109,6 @@ steps: LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy RUST_BACKTRACE: 1 RUST_TEST_THREADS: 1 - CARGO_HOME: /drone/src/.cargo commands: - apt-get update - apt-get -y install --no-install-recommends espeak postgresql-client libssl-dev pkg-config libpq-dev @@ -128,8 +118,6 @@ steps: # Using Debian here because there seems to be no official Alpine-based Rust docker image for ARM. - name: cargo build image: rust:1.50-slim-buster - environment: - CARGO_HOME: /drone/src/.cargo commands: - apt-get update - apt-get -y install --no-install-recommends libssl-dev pkg-config libpq-dev From e9eca35816b2125ddcca73ceef62409fbb749c3c Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 19 Mar 2021 15:58:24 -0400 Subject: [PATCH 2/2] Version 0.10.0-rc.8 --- ansible/VERSION | 2 +- crates/utils/src/version.rs | 2 +- docker/dev/docker-compose.yml | 2 +- docker/federation/docker-compose.yml | 10 +++++----- docker/prod/docker-compose.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ansible/VERSION b/ansible/VERSION index 69843acd5..90bed77d8 100644 --- a/ansible/VERSION +++ b/ansible/VERSION @@ -1 +1 @@ -0.10.0-rc.7 +0.10.0-rc.8 diff --git a/crates/utils/src/version.rs b/crates/utils/src/version.rs index ad718a725..51afdfbc4 100644 --- a/crates/utils/src/version.rs +++ b/crates/utils/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "0.10.0-rc.7"; +pub const VERSION: &str = "0.10.0-rc.8"; diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index e4c2a10f3..a0e59ddf4 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -17,7 +17,7 @@ services: - iframely lemmy-ui: - image: dessalines/lemmy-ui:0.10.0-rc.7 + image: dessalines/lemmy-ui:0.10.0-rc.8 ports: - "1235:1234" restart: always diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml index b3a10c142..77bb53fa6 100644 --- a/docker/federation/docker-compose.yml +++ b/docker/federation/docker-compose.yml @@ -29,7 +29,7 @@ services: - ./volumes/pictrs_alpha:/mnt lemmy-alpha-ui: - image: dessalines/lemmy-ui:0.10.0-rc.7 + image: dessalines/lemmy-ui:0.10.0-rc.8 environment: - LEMMY_INTERNAL_HOST=lemmy-alpha:8541 - LEMMY_EXTERNAL_HOST=localhost:8541 @@ -58,7 +58,7 @@ services: - ./volumes/postgres_alpha:/var/lib/postgresql/data lemmy-beta-ui: - image: dessalines/lemmy-ui:0.10.0-rc.7 + image: dessalines/lemmy-ui:0.10.0-rc.8 environment: - LEMMY_INTERNAL_HOST=lemmy-beta:8551 - LEMMY_EXTERNAL_HOST=localhost:8551 @@ -87,7 +87,7 @@ services: - ./volumes/postgres_beta:/var/lib/postgresql/data lemmy-gamma-ui: - image: dessalines/lemmy-ui:0.10.0-rc.7 + image: dessalines/lemmy-ui:0.10.0-rc.8 environment: - LEMMY_INTERNAL_HOST=lemmy-gamma:8561 - LEMMY_EXTERNAL_HOST=localhost:8561 @@ -117,7 +117,7 @@ services: # An instance with only an allowlist for beta lemmy-delta-ui: - image: dessalines/lemmy-ui:0.10.0-rc.7 + image: dessalines/lemmy-ui:0.10.0-rc.8 environment: - LEMMY_INTERNAL_HOST=lemmy-delta:8571 - LEMMY_EXTERNAL_HOST=localhost:8571 @@ -147,7 +147,7 @@ services: # An instance who has a blocklist, with lemmy-alpha blocked lemmy-epsilon-ui: - image: dessalines/lemmy-ui:0.10.0-rc.7 + image: dessalines/lemmy-ui:0.10.0-rc.8 environment: - LEMMY_INTERNAL_HOST=lemmy-epsilon:8581 - LEMMY_EXTERNAL_HOST=localhost:8581 diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 2d2d75722..ec37ed98f 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:0.10.0-rc.7 + image: dessalines/lemmy:0.10.0-rc.8 ports: - "127.0.0.1:8536:8536" restart: always @@ -26,7 +26,7 @@ services: - iframely lemmy-ui: - image: dessalines/lemmy-ui:0.10.0-rc.7 + image: dessalines/lemmy-ui:0.10.0-rc.8 ports: - "127.0.0.1:1235:1234" restart: always