diff --git a/.travis.yml b/.travis.yml index d61ca35..c01a389 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,11 +33,6 @@ before_install: - pip install git+https://github.com/antmicro/tuttest@prefix-lines-with#egg=tuttest install: - - if [ "$OS" = "ubuntu" ]; then export INSTALL_COMMAND="apt update && apt install -y"; fi - - if [ "$OS" = "centos" ]; then export INSTALL_COMMAND="yum -y install"; fi - - if [ "$OS" = "ubuntu" ]; then export INSTALL_PACKAGES="wget"; fi - - if [ "$OS" = "centos" ]; then export INSTALL_PACKAGES="wget"; fi - - if [ "$OS" = "centos" ] && [ "$OS_VERSION" = "6" ]; then export INSTALL_PACKAGES="$INSTALL_PACKAGES util-linux-ng"; fi # Install missing `getopt` binary in centos 6 - export DOCKER_NAME=test - export IN_DOCKER_EXEC="docker exec -t $DOCKER_NAME bash -c" - docker create @@ -50,9 +45,9 @@ install: --tty $OS:$OS_VERSION - docker start $DOCKER_NAME - - $IN_DOCKER_EXEC "$INSTALL_COMMAND $INSTALL_PACKAGES" - - if [ "$OS_VERSION" = "6" ] || [ "$OS_VERSION" = "trusty" ]; then $IN_DOCKER_EXEC "echo 'readlink -f \$@' | tee -a /usr/bin/realpath;chmod +x /usr/bin/realpath"; fi # Replace missing `realpath` binary with readlink -f - - tuttest README.rst unnamed0 --prefix-lines-with "$IN_DOCKER_EXEC" | bash - + - if [ "$OS" = "ubuntu" ]; then tuttest README.rst unnamed0 --prefix-lines-with "$IN_DOCKER_EXEC" | bash -; fi + - if [ "$OS" = "centos" ]; then tuttest README.rst unnamed1 --prefix-lines-with "$IN_DOCKER_EXEC" | bash -; fi + - tuttest README.rst unnamed2 --prefix-lines-with "$IN_DOCKER_EXEC" | bash - - if [ "$TOOLCHAIN" = "xilinx-series-7" ]; then tuttest xc7/README.rst unnamed0 --prefix-lines-with "$IN_DOCKER_EXEC" | bash -; fi - if [ "$TOOLCHAIN" = "quicklogic" ]; then tuttest eos-s3/README.rst unnamed0 --prefix-lines-with "$IN_DOCKER_EXEC" | bash -; fi diff --git a/README.rst b/README.rst index 6ebde32..107d875 100644 --- a/README.rst +++ b/README.rst @@ -22,7 +22,6 @@ The repository includes: * `.travis.yml <.travis.yml>`_ - Travis CI configuration file - Clone this repository --------------------- @@ -34,6 +33,22 @@ If you have not already done so, clone this repository and ``cd`` into it: git clone https://github.com/SymbiFlow/symbiflow-examples.git && cd symbiflow-examples +Prerequisites +------------- +The only required prerequisite is ``wget``. You can install it using: + +* For Ubuntu: + +.. code:: bash + + apt update && apt install -y wget + +* For CentOS: + +.. code:: bash + + yum install -y wget + Toolchain installation ---------------------- diff --git a/README.src.rst b/README.src.rst index abbaf93..b0322f5 100644 --- a/README.src.rst +++ b/README.src.rst @@ -22,7 +22,6 @@ The repository includes: * `.travis.yml <.travis.yml>`_ - Travis CI configuration file - Clone this repository --------------------- @@ -34,6 +33,22 @@ If you have not already done so, clone this repository and ``cd`` into it: git clone https://github.com/SymbiFlow/symbiflow-examples.git && cd symbiflow-examples +Prerequisites +------------- +The only required prerequisite is ``wget``. You can install it using: + +* For Ubuntu: + +.. code:: bash + + apt update && apt install -y wget + +* For CentOS: + +.. code:: bash + + yum install -y wget + Toolchain installation ---------------------- diff --git a/eos-s3/environment.yml b/eos-s3/environment.yml index 2f4802a..df1432d 100644 --- a/eos-s3/environment.yml +++ b/eos-s3/environment.yml @@ -12,6 +12,8 @@ dependencies: - intervaltree - git - pip + - coreutils + - util-linux # Packages installed from PyPI - pip: - -r file:requirements.txt