Selaa lähdekoodia

build techempower/tfb as part of tfb script (#4062)

* build techempower/tfb as part of tfb script

* identify a change to the tfb script as a core toolset change for travis
Nate 6 vuotta sitten
vanhempi
commit
617c594a7c
2 muutettua tiedostoa jossa 2 lisäystä ja 1 poistoa
  1. 1 0
      tfb
  2. 1 1
      toolset/travis/travis_diff.py

+ 1 - 0
tfb

@@ -102,4 +102,5 @@ if ! docker network inspect tfb >/dev/null 2>&1; then
 fi
 fi
 
 
 test -t 1 && USE_TTY="-t"
 test -t 1 && USE_TTY="-t"
+docker build -t techempower/tfb - < Dockerfile
 exec docker run -i ${USE_TTY} --rm --network tfb -v /var/run/docker.sock:/var/run/docker.sock -v ${SCRIPT_ROOT}:/FrameworkBenchmarks techempower/tfb "${@}"
 exec docker run -i ${USE_TTY} --rm --network tfb -v /var/run/docker.sock:/var/run/docker.sock -v ${SCRIPT_ROOT}:/FrameworkBenchmarks techempower/tfb "${@}"

+ 1 - 1
toolset/travis/travis_diff.py

@@ -170,7 +170,7 @@ if re.search(r'\[ci lang .+\]', last_commit_msg, re.M):
 # Also for now, ignore the old linux setup folders, as we don't want to
 # Also for now, ignore the old linux setup folders, as we don't want to
 # trigger a full run as we remove old fw_depends scripts. [ci run-all] will
 # trigger a full run as we remove old fw_depends scripts. [ci run-all] will
 # still work if it's needed.
 # still work if it's needed.
-if re.search(r'^toolset/(?!(travis/|continuous/|scaffolding/))', changes, re.M) is not None:
+if re.search(r'^toolset\/(?!(travis\/|continuous\/|scaffolding\/))|^tfb', changes, re.M) is not None:
     print("Found changes to core toolset. Running all tests.")
     print("Found changes to core toolset. Running all tests.")
     run_tests = test_dirs
     run_tests = test_dirs
     quit_diffing()
     quit_diffing()