github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 22:43:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "DEV: Remove the remaining ENV["TRAVIS"] usage (#10041)"

Browse Source 
This reverts commit 78aff841e3215c875e79692fbeaf8d18c4514006.

See https://review.discourse.org/t/dev-remove-the-remaining-env-travis-usage-10041/12737/4?u=cvx
This commit is contained in:
Jarek Radosz
2020-06-16 19:36:40 +02:00
parent 78aff841e3
commit 669c940ec3
4 changed files with 85 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
script/docker_test.rb
View File

@ -8,6 +8,8 @@
# => RUN_SMOKE_TESTS executes the smoke tests instead of the regular tests from docker.rake
# See lib/tasks/docker.rake and lib/tasks/smoke_test.rake for more information
puts "travis_fold:end:starting_docker_container" if ENV["TRAVIS"]
def log(message)
puts "[#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}] #{message}"
end
@ -20,17 +22,24 @@ def run_or_fail(command)
end
unless ENV['NO_UPDATE']
puts "travis_fold:start:pulling_latest_discourse" if ENV["TRAVIS"]
run_or_fail("git reset --hard")
run_or_fail("git fetch")
checkout = ENV['COMMIT_HASH'] || "FETCH_HEAD"
run_or_fail("LEFTHOOK=0 git checkout #{checkout}")
puts "travis_fold:end:pulling_latest_discourse" if ENV["TRAVIS"]
puts "travis_fold:start:bundle" if ENV["TRAVIS"]
run_or_fail("bundle")
puts "travis_fold:end:bundle" if ENV["TRAVIS"]
end
log("Running tests")
if ENV['RUN_SMOKE_TESTS']
run_or_fail("bundle exec rake smoke:test")
else