force rm tmp/cache even on fresh start

meedan · Jul 7, 2021 · f5f51cc · f5f51cc
1 parent 8e90598
commit f5f51cc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/ci-test-pr.yml b/.github/workflows/ci-test-pr.yml
@@ -107,6 +107,7 @@ jobs:
       run: |
         DEPLOY_ENV=test docker-compose -f docker-compose.yml -f docker-test.yml up -d
         until curl --silent -I -f --fail http://localhost:3000 ; do printf .; sleep 1; done
+        docker-compose exec -T api rm -r tmp/cache tmp/cache1 tmp/cache2 tmp/cache3 tmp/cache4 tmp/cache5 || true
         docker-compose exec -T api mkdir -p tmp/cache tmp/cache1 tmp/cache2 tmp/cache3 tmp/cache4 tmp/cache5
         docker-compose exec -T api test/setup-parallel-env.sh
         docker-compose exec -T api bundle exec rake assets:precompile

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -8,9 +8,9 @@ set_config() {
 }
 
 if [[ "${DEPLOY_ENV}" == "test" ]]; then
-    set_config
-    touch tmp/parallel_runtime_test.log
-    chmod +w tmp/parallel_runtime_test.log
+  set_config
+  touch tmp/parallel_runtime_test.log
+  chmod +w tmp/parallel_runtime_test.log
 fi
 
 # Rake tasks