From 3ffea1492c45a14eff55d087421ff51d6671dd7d Mon Sep 17 00:00:00 2001 From: Kamil Rakoczy Date: Mon, 28 Sep 2020 09:02:13 +0200 Subject: [PATCH] Update to use named snippets Signed-off-by: Kamil Rakoczy --- .travis.yml | 17 +++++++++-------- README.rst | 4 +++- README.src.rst | 2 ++ eos-s3/README.rst | 2 +- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index c01a389..22d5e8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ before_install: - export LANG="en_US.UTF-8" - source .github/travis/common.sh - rm README.rst && make README.rst && .github/travis/git-check.sh - - pip install git+https://github.com/antmicro/tuttest@prefix-lines-with#egg=tuttest + - pip install git+https://github.com/antmicro/tuttest#egg=tuttest install: - export DOCKER_NAME=test @@ -40,18 +40,19 @@ install: --env LANG="en_US.UTF-8" --env LANGUAGE="en_US" --env DEBIAN_FRONTEND="noninteractive" + --env INSTALL_DIR=~/opt/symbiflow/ -v /home/travis:/home/travis --workdir $PWD --tty $OS:$OS_VERSION - docker start $DOCKER_NAME - - 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 + - if [ "$OS" = "ubuntu" ]; then tuttest README.rst install-wget-ubuntu --prefix-lines-with "$IN_DOCKER_EXEC" | bash -ex -; fi + - if [ "$OS" = "centos" ]; then tuttest README.rst install-wget-centos --prefix-lines-with "$IN_DOCKER_EXEC" | bash -ex -; fi + - tuttest README.rst wget-conda --prefix-lines-with "$IN_DOCKER_EXEC" | bash -ex - + - if [ "$TOOLCHAIN" = "xilinx-series-7" ]; then tuttest xc7/README.rst xc7-setup-toolchain --prefix-lines-with "$IN_DOCKER_EXEC" | bash -ex -; fi + - if [ "$TOOLCHAIN" = "quicklogic" ]; then tuttest eos-s3/README.rst eoss3-setup-toolchain --prefix-lines-with "$IN_DOCKER_EXEC" | bash -ex -; fi script: - - if [ "$TOOLCHAIN" = "xilinx-series-7" ]; then tuttest xc7/README.rst unnamed1,unnamed2,unnamed3,unnamed4,unnamed5 --prefix-lines-with "$IN_DOCKER_EXEC" | bash -; fi - - if [ "$TOOLCHAIN" = "quicklogic" ]; then tuttest eos-s3/README.rst unnamed1,unnamed2 --prefix-lines-with "$IN_DOCKER_EXEC" | bash -; fi + - if [ "$TOOLCHAIN" = "xilinx-series-7" ]; then tuttest xc7/README.rst xc7-prepare-env,xc7-counter,xc7-picosoc,xc7-litex,xc7-linux --prefix-lines-with "$IN_DOCKER_EXEC" --single-command | bash -ex -; fi + - if [ "$TOOLCHAIN" = "quicklogic" ]; then tuttest eos-s3/README.rst eoss3-prepare-env,eoss3-counter --prefix-lines-with "$IN_DOCKER_EXEC" --single-command | bash -ex -; fi diff --git a/README.rst b/README.rst index 107d875..43b3bf0 100644 --- a/README.rst +++ b/README.rst @@ -40,12 +40,14 @@ The only required prerequisite is ``wget``. You can install it using: * For Ubuntu: .. code:: bash + :name: install-wget-ubuntu apt update && apt install -y wget * For CentOS: .. code:: bash + :name: install-wget-centos yum install -y wget @@ -99,7 +101,7 @@ and so you will need to add some ``sudo`` commands to the instructions below. source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh" conda env create -f eos-s3/environment.yml conda activate eos-s3 - wget -qO- https://quicklogic-my.sharepoint.com/:u:/p/kkumar/EWuqtXJmalROpI2L5XeewMIBRYVCY8H4yc10nlli-Xq79g?download=1 | tar -xJ -C $INSTALL_DIR + wget -qO- https://quicklogic-my.sharepoint.com/:u:/p/kkumar/EWuqtXJmalROpI2L5XeewMIBRYVCY8H4yc10nlli-Xq79g?download=1 | tar -xJ -C $INSTALL_DIR/eos-s3/ conda deactivate Build Example Designs diff --git a/README.src.rst b/README.src.rst index b0322f5..eb6becc 100644 --- a/README.src.rst +++ b/README.src.rst @@ -40,12 +40,14 @@ The only required prerequisite is ``wget``. You can install it using: * For Ubuntu: .. code:: bash + :name: install-wget-ubuntu apt update && apt install -y wget * For CentOS: .. code:: bash + :name: install-wget-centos yum install -y wget diff --git a/eos-s3/README.rst b/eos-s3/README.rst index 06416aa..ef166a2 100644 --- a/eos-s3/README.rst +++ b/eos-s3/README.rst @@ -33,7 +33,7 @@ Choose the installation directory (see the `README <../README.rst>`_ one level u source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh" conda env create -f eos-s3/environment.yml conda activate eos-s3 - wget -qO- https://quicklogic-my.sharepoint.com/:u:/p/kkumar/EWuqtXJmalROpI2L5XeewMIBRYVCY8H4yc10nlli-Xq79g?download=1 | tar -xJ -C $INSTALL_DIR + wget -qO- https://quicklogic-my.sharepoint.com/:u:/p/kkumar/EWuqtXJmalROpI2L5XeewMIBRYVCY8H4yc10nlli-Xq79g?download=1 | tar -xJ -C $INSTALL_DIR/eos-s3/ conda deactivate .. toolchain_include_end_label