From 33c26a9cac9a0ae5704074b1463e134ee60c19d2 Mon Sep 17 00:00:00 2001 From: Tim Cowlishaw Date: Fri, 20 Dec 2024 21:53:43 +0100 Subject: [PATCH] maybe the last one? --- .github/workflows/ruby.yml | 4 ++-- ci.sh | 4 +++- env.example | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index c7e2d1e6..f3681efb 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -23,7 +23,7 @@ jobs: run: "docker compose build" - name: Run all tests - run: docker compose run app -- ./ci.sh + run: "docker compose run app -- ./ci.sh" - name: Tear down the Stack - run: docker compose down + run: "docker compose down" diff --git a/ci.sh b/ci.sh index d3c7ad22..bbdcf67e 100755 --- a/ci.sh +++ b/ci.sh @@ -1,4 +1,6 @@ #!/bin/bash - +set -e +bundle exec bin/rake db:create +bundle exec bin/rake db:schema:load unset DATABASE_URL bundle exec bin/rake spec diff --git a/env.example b/env.example index fcdd837d..fc5a89ad 100644 --- a/env.example +++ b/env.example @@ -10,6 +10,7 @@ DATABASE_URL=postgresql://postgres:postgres@db/sc_dev TEST_DB_HOST=db TEST_DB_USERNAME=postgres +TEST_DB_PASSWORD=postgres # Tell sidekiq to use hostname redis, not localhost # If this var is set, Redis uses it by default. No config needed @@ -44,3 +45,6 @@ PROMETHEUS_URL= PROMETHEUS_USERNAME= PROMETHEUS_PASSWORD= PROMETHEUS_INSTANCE_LABEL= + + +DISCOURSE_SSO_SECRET="InsertDiscourseSSOSecretHERE"