CI: use v0.2-beta tuttest and combine snippets

Signed-off-by: Karol Gugala <kgugala@antmicro.com>
This commit is contained in:
Karol Gugala 2021-01-19 22:52:16 +01:00
parent 37b4d48247
commit 5d39bcf354
3 changed files with 8 additions and 8 deletions

View file

@ -54,20 +54,20 @@ fi
# activate conda and enter example dir # activate conda and enter example dir
snippets="export-install-dir,fpga-fam-$fpga_family,conda-prep-env,conda-act-env,enter-dir-$fpga_family" snippets="docs/building-examples.rst:export-install-dir,fpga-fam-$fpga_family,conda-prep-env,conda-act-env,enter-dir-$fpga_family"
# Xilinx 7-Series examples # Xilinx 7-Series examples
if [ "$fpga_family" = "xc7" ]; then if [ "$fpga_family" = "xc7" ]; then
for example in $examples; do for example in $examples; do
case $example in case $example in
"counter") "counter")
snippets="${snippets},example-counter-*-group" snippets="${snippets} xc7/counter_test/README.rst:example-counter-*-group"
;; ;;
"picosoc") "picosoc")
snippets="${snippets},xc7/picosoc_demo/README.rst,example-picosoc-*-group" snippets="${snippets} xc7/picosoc_demo/README.rst:example-picosoc-*-group"
;; ;;
"litex_linux") "litex_linux")
snippets="${snippets},xc7/linux_litex_demo/README.rst,example-litex-deps,example-litex-*-group" snippets="${snippets} xc7/linux_litex_demo/README.rst:example-litex-deps,example-litex-*-group"
;; ;;
*) *)
echo "ERROR: Unknown example name: $example" >&2 echo "ERROR: Unknown example name: $example" >&2
@ -80,7 +80,7 @@ elif [ "$fpga_family" = "eos-s3" ]; then
for example in $examples; do for example in $examples; do
case $example in case $example in
"counter") "counter")
snippets="${snippets},eos-s3-counter" snippets="${snippets} eos-s3/btn_counter/README.rst:eos-s3-counter"
;; ;;
*) *)
echo "ERROR: Unknown example name: $example" >&2 echo "ERROR: Unknown example name: $example" >&2
@ -94,4 +94,4 @@ else
fi fi
# call tuttest # call tuttest
tuttest_exec docs/building-examples.rst ${snippets} tuttest_exec ${snippets}

View file

@ -45,4 +45,4 @@ fi
fpga_family=$1 fpga_family=$1
os=$2 os=$2
tuttest_exec docs/getting-symbiflow.rst install-reqs-$os,wget-conda,conda-install-dir,fpga-fam-$fpga_family,conda-setup,download-arch-def-$fpga_family tuttest_exec docs/getting-symbiflow.rst:install-reqs-$os,wget-conda,conda-install-dir,fpga-fam-$fpga_family,conda-setup,download-arch-def-$fpga_family

View file

@ -64,7 +64,7 @@ jobs:
- name: Install tuttest - name: Install tuttest
run: | run: |
wget https://github.com/antmicro/tuttest/releases/download/0.1.1/tuttest -O /usr/bin/tuttest wget https://github.com/antmicro/tuttest/releases/download/v0.2-beta/tuttest -O /usr/bin/tuttest
chmod a+rx /usr/bin/tuttest chmod a+rx /usr/bin/tuttest
- name: Install SymbiFlow toolchain - name: Install SymbiFlow toolchain