Hardware
/
f4pga-examples
mirror of https://github.com/chipsalliance/f4pga-examples.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

travis: Use toolchain name directly. 

A small change to the naming in eos-s3/README.rst names means we can
simplify the .travis.yml to use the TOOLCHAIN value directly rather than
needing multiple if statements.

Also add comments to explain what is happening in each section.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
This commit is contained in:
Tim 'mithro' Ansell 2020-09-28 06:59:30 -07:00
parent 2ef044b502
commit b15679093c
3 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
.travis.yml
View File

@ -7,32 +7,30 @@ services:
env: env:
# Testing QuickLogic toolchain on all OSes # Testing QuickLogic toolchain on all OSes
- TOOLCHAIN=quicklogic OS=ubuntu OS_VERSION=trusty - TOOLCHAIN=eos-s3 OS=ubuntu OS_VERSION=trusty
- TOOLCHAIN=quicklogic OS=ubuntu OS_VERSION=xenial - TOOLCHAIN=eos-s3 OS=ubuntu OS_VERSION=xenial
- TOOLCHAIN=quicklogic OS=ubuntu OS_VERSION=bionic - TOOLCHAIN=eos-s3 OS=ubuntu OS_VERSION=bionic
- TOOLCHAIN=quicklogic OS=ubuntu OS_VERSION=eoan - TOOLCHAIN=eos-s3 OS=ubuntu OS_VERSION=eoan
- TOOLCHAIN=quicklogic OS=ubuntu OS_VERSION=focal - TOOLCHAIN=eos-s3 OS=ubuntu OS_VERSION=focal
- TOOLCHAIN=quicklogic OS=centos OS_VERSION=6 - TOOLCHAIN=eos-s3 OS=centos OS_VERSION=6
- TOOLCHAIN=quicklogic OS=centos OS_VERSION=7 - TOOLCHAIN=eos-s3 OS=centos OS_VERSION=7
- TOOLCHAIN=quicklogic OS=centos OS_VERSION=8 - TOOLCHAIN=eos-s3 OS=centos OS_VERSION=8
# Testing Xilinx 7 Series toolchain on all OSes # Testing Xilinx 7 Series toolchain on all OSes
- TOOLCHAIN=xilinx-series-7 OS=ubuntu OS_VERSION=trusty - TOOLCHAIN=xc7 OS=ubuntu OS_VERSION=trusty
- TOOLCHAIN=xilinx-series-7 OS=ubuntu OS_VERSION=xenial - TOOLCHAIN=xc7 OS=ubuntu OS_VERSION=xenial
- TOOLCHAIN=xilinx-series-7 OS=ubuntu OS_VERSION=bionic - TOOLCHAIN=xc7 OS=ubuntu OS_VERSION=bionic
- TOOLCHAIN=xilinx-series-7 OS=ubuntu OS_VERSION=eoan - TOOLCHAIN=xc7 OS=ubuntu OS_VERSION=eoan
- TOOLCHAIN=xilinx-series-7 OS=ubuntu OS_VERSION=focal - TOOLCHAIN=xc7 OS=ubuntu OS_VERSION=focal
- TOOLCHAIN=xilinx-series-7 OS=centos OS_VERSION=6 - TOOLCHAIN=xc7 OS=centos OS_VERSION=6
- TOOLCHAIN=xilinx-series-7 OS=centos OS_VERSION=7 - TOOLCHAIN=xc7 OS=centos OS_VERSION=7
- TOOLCHAIN=xilinx-series-7 OS=centos OS_VERSION=8 - TOOLCHAIN=xc7 OS=centos OS_VERSION=8
before_install: before_install:
- sudo locale-gen "en_US.UTF-8" - sudo locale-gen "en_US.UTF-8"
- export LANG="en_US.UTF-8" - export LANG="en_US.UTF-8"
- source .github/travis/common.sh - source .github/travis/common.sh
- rm README.rst && make README.rst && .github/travis/git-check.sh # Get tuttest and setup a docker container to run the test in.
- pip install git+https://github.com/antmicro/tuttest#egg=tuttest - pip install git+https://github.com/antmicro/tuttest#egg=tuttest
install:
- export DOCKER_NAME=test - export DOCKER_NAME=test
- export IN_DOCKER_EXEC="docker exec -t $DOCKER_NAME bash -c" - export IN_DOCKER_EXEC="docker exec -t $DOCKER_NAME bash -c"
- docker create - docker create
@ -46,13 +44,16 @@ install:
--tty --tty
$OS:$OS_VERSION $OS:$OS_VERSION
- docker start $DOCKER_NAME - docker start $DOCKER_NAME
- 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 install:
# Check the top level README file is up to date.
- rm README.rst && make README.rst && .github/travis/git-check.sh
# Install the toolchain into the docker container.
- tuttest README.rst install-wget-${OS} --prefix-lines-with "$IN_DOCKER_EXEC" | bash -ex -
- tuttest README.rst wget-conda --prefix-lines-with "$IN_DOCKER_EXEC" | bash -ex - - 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 - tuttest ${TOOLCHAIN}/README.rst ${TOOLCHAIN}-setup-toolchain --prefix-lines-with "$IN_DOCKER_EXEC" | bash -ex -
- if [ "$TOOLCHAIN" = "quicklogic" ]; then tuttest eos-s3/README.rst eoss3-setup-toolchain --prefix-lines-with "$IN_DOCKER_EXEC" | bash -ex -; fi
script: script:
- 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 # Run the tests inside the docker container.
- 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 - if [ "$TOOLCHAIN" = "xc7" ]; then EXTRA_TESTS=,xc7-picosoc,xc7-litex,xc7-linux; fi
- tuttest ${TOOLCHAIN}/README.rst ${TOOLCHAIN}-prepare-env,${TOOLCHAIN}-counter${EXTRA_TESTS} --prefix-lines-with "$IN_DOCKER_EXEC" --single-command | bash -ex -

6
README.rst
View File

@ -95,7 +95,7 @@ and so you will need to add some ``sudo`` commands to the instructions below.
* For the EOS S3 devices: * For the EOS S3 devices:
.. code:: bash .. code:: bash
:name: eoss3-setup-toolchain :name: eos-s3-setup-toolchain
bash conda_installer.sh -b -p $INSTALL_DIR/eos-s3/conda bash conda_installer.sh -b -p $INSTALL_DIR/eos-s3/conda
source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh" source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh"
@ -184,7 +184,7 @@ Before building any example, set the installation directory to match what you se
and prepare the environment: and prepare the environment:
.. code:: bash .. code:: bash
:name: eoss3-prepare-env :name: eos-s3-prepare-env
export PATH="$INSTALL_DIR/eos-s3/install/bin:$PATH" export PATH="$INSTALL_DIR/eos-s3/install/bin:$PATH"
source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh" source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh"
@ -193,7 +193,7 @@ and prepare the environment:
To build the example, run the following command: To build the example, run the following command:
.. code:: bash .. code:: bash
:name: eoss3-counter :name: eos-s3-counter
pushd eos-s3/btn_counter && make && popd pushd eos-s3/btn_counter && make && popd

6
eos-s3/README.rst
View File

@ -27,7 +27,7 @@ Choose the installation directory (see the `README <../README.rst>`_ one level u
.. toolchain_include_begin_label .. toolchain_include_begin_label
.. code:: bash .. code:: bash
:name: eoss3-setup-toolchain :name: eos-s3-setup-toolchain
bash conda_installer.sh -b -p $INSTALL_DIR/eos-s3/conda bash conda_installer.sh -b -p $INSTALL_DIR/eos-s3/conda
source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh" source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh"
@ -52,7 +52,7 @@ Before building any example, set the installation directory to match what you se
and prepare the environment: and prepare the environment:
.. code:: bash .. code:: bash
:name: eoss3-prepare-env :name: eos-s3-prepare-env
export PATH="$INSTALL_DIR/eos-s3/install/bin:$PATH" export PATH="$INSTALL_DIR/eos-s3/install/bin:$PATH"
source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh" source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh"
@ -61,7 +61,7 @@ and prepare the environment:
To build the example, run the following command: To build the example, run the following command:
.. code:: bash .. code:: bash
:name: eoss3-counter :name: eos-s3-counter
pushd eos-s3/btn_counter && make && popd pushd eos-s3/btn_counter && make && popd