From 80014fa037fa06e775793291b07cf774a3124239 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Thu, 12 Nov 2020 12:48:02 +0300 Subject: [PATCH 1/3] Test "production" container on Travis --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d3357e4..48b1c6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,11 +6,12 @@ language: before_install: - docker-compose build - docker images - - docker-compose -f docker-compose.yml -f docker-compose.debug.yml up -d + - docker-compose -f docker-compose.yml up -d + #- docker-compose -f docker-compose.yml -f docker-compose.debug.yml up -d - docker-compose ps script: + # wait for the server to load - wget --timeout 3 --tries=5 --spider localhost:8002 2>&1 | grep -i http - docker-compose logs --no-color - - docker logs chtsh - CHEATSH_TEST_STANDALONE=NO bash tests/run-tests.sh From 48c7fc60fae38bb871d85727d158db63815dc394 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Thu, 12 Nov 2020 13:06:20 +0300 Subject: [PATCH 2/3] Move all server init into `before_install:` section --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 48b1c6a..70d308e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,9 @@ before_install: - docker-compose -f docker-compose.yml up -d #- docker-compose -f docker-compose.yml -f docker-compose.debug.yml up -d - docker-compose ps - -script: - # wait for the server to load + # wait until the web server is up - wget --timeout 3 --tries=5 --spider localhost:8002 2>&1 | grep -i http - docker-compose logs --no-color + +script: - CHEATSH_TEST_STANDALONE=NO bash tests/run-tests.sh From 067e0de4d75eea38ab7e969467bb5250dd6abeb9 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Thu, 12 Nov 2020 13:08:04 +0300 Subject: [PATCH 3/3] Run GitHub tests on Ubuntu 20.04 --- .github/workflows/tests-ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests-ubuntu.yml b/.github/workflows/tests-ubuntu.yml index 109b600..99947a2 100644 --- a/.github/workflows/tests-ubuntu.yml +++ b/.github/workflows/tests-ubuntu.yml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2