From 9cd048885e96bc45ddc31e7f84e15fcd8485180f Mon Sep 17 00:00:00 2001 From: Pawel Czarnecki Date: Thu, 28 Jul 2022 11:56:41 +0200 Subject: [PATCH] fix F4PGA_DIR_ROOT inconsistency Signed-off-by: Pawel Czarnecki --- .github/scripts/activate.sh | 5 +---- .github/scripts/prepare_environment.sh | 7 +++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/scripts/activate.sh b/.github/scripts/activate.sh index 13782a1..5808bb9 100755 --- a/.github/scripts/activate.sh +++ b/.github/scripts/activate.sh @@ -20,10 +20,7 @@ set -e FPGA_FAM=${FPGA_FAM:=xc7} -case "$FPGA_FAM" in - xc7) F4PGA_DIR_ROOT='install';; - eos-s3) F4PGA_DIR_ROOT='quicklogic-arch-defs';; -esac +F4PGA_DIR_ROOT='install' export PATH="$F4PGA_INSTALL_DIR/$FPGA_FAM/$F4PGA_DIR_ROOT/bin:$PATH" source "$F4PGA_INSTALL_DIR/$FPGA_FAM/conda/etc/profile.d/conda.sh" diff --git a/.github/scripts/prepare_environment.sh b/.github/scripts/prepare_environment.sh index cf6eed9..718fd31 100755 --- a/.github/scripts/prepare_environment.sh +++ b/.github/scripts/prepare_environment.sh @@ -68,10 +68,9 @@ cd .. echo '::group::Add f4pga-env' -case "$FPGA_FAM" in - xc7) F4PGA_DIR_ROOT='install';; - eos-s3) F4PGA_DIR_ROOT='quicklogic-arch-defs';; -esac + +F4PGA_DIR_ROOT='install' + F4PGA_DIR_BIN="$F4PGA_INSTALL_DIR_FAM/$F4PGA_DIR_ROOT"/bin/ mkdir -p "$F4PGA_DIR_BIN" cp $(dirname "$0")/../../f4pga-env "$F4PGA_DIR_BIN"