Skip to content

Commit

Permalink
Separates out Travis into a bunch of build stages (#1932)
Browse files Browse the repository at this point in the history
* initial attempt at job stages

* more work on travis jobs

* wip

* wip

* more job stuff

* expand travis C++ stage

* wip

* play around more with build stage aliases

* add a cache stage

* simplify travis file

* add before_install.sh step

* add script skip to cache stage

* add another stage

* add unit test stage

* allow PHP 7.2 to fail for now

* add e2e testing

* add initial integration

* only use one integration stage for right now

* attempt to add another integration stage

* remove temp file

* finish integration test matrix

* Fill out e2e tests

* work on setting up e2e testing

* add pip install lines for e2e tests

* work on integration tests

* add start-directory for test discovery

* add lines for installation of python_submitty_utils

* test for e2e

* debug e2e

* play aorund with travis apache conf

* work more on travis.yml

* play around more with apache conf

* more attempts at apache conf

* re-enable missing apache module

* continue trying to debug

* fix travis file

* more debugging

* set missing bash variable

* try and revert some changes of travis.yml

* remove unnecessary if

* try and fix the autograder tests

* attempt to debug .travis

* attempt to fix integration matrix

* test to see what we need to install for clang-5.0

* try, try again

* try again x 2

* try again with clang?

* add more clangs

* fix brokne travis.yml

* don't touch clang?

* try installing both clang + clang-x.x

* wat

* create clang matrix?

* unquiet clang

* try try again

* weird random travis?

* what is going on?

* ugh

* try and fix travis?

* try and simplify llvm

* use Clang 5.0.1 for the prebuilt

* bring it all together

* remove bunch of old unnecessary files

* fix travis build

* add some python unit testing

* fix travis mistake

* use the cache for python unit tests

* remove unnecessary test_require package

* update cache for vendor
  • Loading branch information
MasterOdin authored and bmcutler committed May 15, 2018
1 parent 67c9781 commit 832274a
Show file tree
Hide file tree
Showing 18 changed files with 360 additions and 229 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ selenium*.jar
*.orig*
*~
*.o
INSTALL.sh
logs/

*.pyc
*.aux
Expand Down
1 change: 0 additions & 1 deletion .setup/bin/setup_sample_courses.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

from submitty_utils import dateutils


# TODO: Remove this and purely use shutil once we move totally to Python 3
from zipfile import ZipFile

Expand Down
16 changes: 16 additions & 0 deletions .setup/travis/before_install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/usr/bin/env bash

# Set the Java version
jdk_switcher use default
# we have to unset this as the JVM will print a message on STDERR on any execution if this is set because somehow that makes sense I guess
unset _JAVA_OPTIONS

# Setup our python3 version to use for application. We try to use python 3.6.x if available, else fallback to
# python 3.5.x
PY_VERSION_3=$(pyenv versions | grep -oP "3.6.[0-9]" || pyenv versions | grep -oP "3.5.[0-9]")
pyenv global ${PY_VERSION_3}

export PATH="$PATH:$HOME/.composer/vendor/bin:/usr/bin"
sudo sed -e "s?secure_path=\"?secure_path=\"/opt/python/${PY_VERSION_3}/bin:${PATH}:?g" --in-place /etc/sudoers
mkdir -p ~/.local/bin
export PATH=$HOME/.local/bin:$PATH
49 changes: 0 additions & 49 deletions .setup/travis/hhvm.sh

This file was deleted.

27 changes: 0 additions & 27 deletions .setup/travis/start.sh

This file was deleted.

Loading

0 comments on commit 832274a

Please sign in to comment.