From abe27a023636c231a8a160810eb4497459524fff Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sat, 6 Apr 2019 10:28:24 -0700 Subject: [PATCH 1/6] Travis --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index fc5cba772..e7e6a7355 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,6 @@ before_script: before_install: - cd server script: - - cargo install diesel_cli --no-default-features --features postgres - - cargo build - - diesel migration run - cargo build --all - cargo test --all env: From 2b7464e149b22000d6ac1de75fd57a62fd3b2231 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sat, 6 Apr 2019 10:36:16 -0700 Subject: [PATCH 2/6] Travis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index e7e6a7355..f9249c13b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,8 @@ before_script: before_install: - cd server script: + - cargo install diesel_cli -- force --no-default-features --features postgres + - diesel migration run - cargo build --all - cargo test --all env: From 595cf7caad5fb688976e21da8cb6040a97cf9566 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sat, 6 Apr 2019 10:49:27 -0700 Subject: [PATCH 3/6] Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f9249c13b..26410fefc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ before_script: before_install: - cd server script: - - cargo install diesel_cli -- force --no-default-features --features postgres + - cargo install --force diesel_cli --no-default-features --features postgres - diesel migration run - cargo build --all - cargo test --all From e340d4a6bf9edc995c894139e71e792916aea612 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sat, 6 Apr 2019 11:08:05 -0700 Subject: [PATCH 4/6] Adding health check to docker-compose. --- docker-compose.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c2b2bfec5..c11c9176a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3' +version: '2.4' services: db: @@ -8,6 +8,11 @@ services: POSTGRES_USER: rrr POSTGRES_PASSWORD: rrr POSTGRES_DB: rrr + healthcheck: + test: ["CMD-SHELL", "pg_isready -U rrr"] + interval: 30s + timeout: 30s + retries: 3 lemmy: build: context: . @@ -17,6 +22,6 @@ services: environment: LEMMY_FRONT_END_DIR: /app/dist DATABASE_URL: postgres://rrr:rrr@db:5432/rrr - - links: - - db + depends_on: + db: + condition: service_healthy From 17af28868f4d99231e0c25b99dab307a9f08a07f Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sat, 6 Apr 2019 09:18:50 -0700 Subject: [PATCH 5/6] Fixing travis ci build - Fixes #39 Travis Travis Travis Travis Travis Travis Travis Travis Travis Travis Travis --- .travis.yml | 11 +++-------- .../2019-03-30-212058_create_post_view/up.sql | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index e3dac1826..26410fefc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,27 +1,22 @@ language: rust rust: - stable - - beta - - nightly matrix: allow_failures: - rust: nightly fast_finish: true -before_cache: - - cd server cache: cargo -services: - - postgresql before_script: - psql -c "create user rrr with password 'rrr' superuser;" -U postgres - psql -c 'create database rrr with owner rrr;' -U postgres before_install: - cd server script: - - cargo install diesel_cli --no-default-features --features postgres - - cargo build + - cargo install --force diesel_cli --no-default-features --features postgres - diesel migration run - cargo build --all - cargo test --all env: - DATABASE_URL=postgres://rrr:rrr@localhost/rrr +addons: + postgresql: "9.4" diff --git a/server/migrations/2019-03-30-212058_create_post_view/up.sql b/server/migrations/2019-03-30-212058_create_post_view/up.sql index 79084a47e..95789c734 100644 --- a/server/migrations/2019-03-30-212058_create_post_view/up.sql +++ b/server/migrations/2019-03-30-212058_create_post_view/up.sql @@ -5,7 +5,7 @@ create or replace function hot_rank( returns integer as $$ begin -- hours_diff:=EXTRACT(EPOCH FROM (timezone('utc',now()) - published))/3600 - return 10000*sign(score)*log(1 + abs(score)) / power(((EXTRACT(EPOCH FROM (timezone('utc',now()) - published))/3600) + 2), 1.8); + return floor(10000*sign(score)*log(1 + abs(score)) / power(((EXTRACT(EPOCH FROM (timezone('utc',now()) - published))/3600) + 2), 1.8))::integer; end; $$ LANGUAGE plpgsql; From c08bd28eb7613e3a484376f07a052d4d6a130cb5 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sat, 6 Apr 2019 11:08:05 -0700 Subject: [PATCH 6/6] Adding health check to docker-compose. --- docker-compose.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c2b2bfec5..c11c9176a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3' +version: '2.4' services: db: @@ -8,6 +8,11 @@ services: POSTGRES_USER: rrr POSTGRES_PASSWORD: rrr POSTGRES_DB: rrr + healthcheck: + test: ["CMD-SHELL", "pg_isready -U rrr"] + interval: 30s + timeout: 30s + retries: 3 lemmy: build: context: . @@ -17,6 +22,6 @@ services: environment: LEMMY_FRONT_END_DIR: /app/dist DATABASE_URL: postgres://rrr:rrr@db:5432/rrr - - links: - - db + depends_on: + db: + condition: service_healthy