github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 09:42:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Do less work in docker_test (#9470)

Browse Source 
* DEV: Update the working tree just once.

`git pull` was effectively doing `git fetch` and `git merge FETCH_HEAD`, and only then we were checking out the desired branch/commit. This change will skip the the merge step.

* DEV: Don't run lefthook in docker_test
This commit is contained in:
Jarek Radosz 2020-04-21 03:48:58 +02:00 committed by GitHub
parent ab52bed014
commit 28c706bd09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
script/docker_test.rb
View File

@ -26,10 +26,10 @@ unless ENV['NO_UPDATE']
run_or_fail("git reset --hard")
run_or_fail("git pull")
run_or_fail("git fetch")
checkout = ENV['COMMIT_HASH'] || "HEAD"
run_or_fail("git checkout #{checkout}")
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"]