From 52bc71a0506cad647951a16fb214ea82934bed0a Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral Date: Sun, 31 Jul 2022 14:06:14 +0200 Subject: [PATCH] docs/building-examples: make conda-prep-env consistent Signed-off-by: Unai Martinez-Corral --- .github/scripts/build-examples.sh | 2 +- docs/building-examples.rst | 22 ++++------------------ 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/.github/scripts/build-examples.sh b/.github/scripts/build-examples.sh index 2f6dd93..5e84a2c 100755 --- a/.github/scripts/build-examples.sh +++ b/.github/scripts/build-examples.sh @@ -54,7 +54,7 @@ esac fi # activate conda and enter example dir -activate_env="docs/building-examples.rst:export-install-dir,fpga-fam-$fpga_family,conda-prep-env-$fpga_family,f4pga-env-bin,f4pga-env-share-$fpga_family,conda-act-env" +activate_env="docs/building-examples.rst:export-install-dir,fpga-fam-$fpga_family,conda-prep-env,f4pga-env-bin,f4pga-env-share-$fpga_family,conda-act-env" snippets="${activate_env},enter-dir-$fpga_family" case "$fpga_family" in diff --git a/docs/building-examples.rst b/docs/building-examples.rst index b393d1a..c15734d 100644 --- a/docs/building-examples.rst +++ b/docs/building-examples.rst @@ -31,25 +31,11 @@ Select your FPGA family: Next, prepare the environment: -.. tabs:: +.. code-block:: bash + :name: conda-prep-env - .. group-tab:: Artix-7 - - .. code-block:: bash - :name: conda-prep-env-xc7 - - export PATH="$F4PGA_INSTALL_DIR/$FPGA_FAM/install/bin:$PATH"; - source "$F4PGA_INSTALL_DIR/$FPGA_FAM/conda/etc/profile.d/conda.sh" - - .. group-tab:: EOS S3 - - .. code-block:: bash - :name: conda-prep-env-eos-s3 - - export PATH="$F4PGA_INSTALL_DIR/$FPGA_FAM/install/bin:$PATH"; - export F4PGA_BIN_DIR="$F4PGA_INSTALL_DIR/$FPGA_FAM/install/bin"; - export F4PGA_SHARE_DIR="$F4PGA_INSTALL_DIR/$FPGA_FAM/install/share/f4pga"; - source "$F4PGA_INSTALL_DIR/$FPGA_FAM/conda/etc/profile.d/conda.sh" + export PATH="$F4PGA_INSTALL_DIR/$FPGA_FAM/install/bin:$PATH"; + source "$F4PGA_INSTALL_DIR/$FPGA_FAM/conda/etc/profile.d/conda.sh" Finally, enter your working Conda environment: