ci/scripts: merge envvars.sh into prepare_environment.sh

Signed-off-by: Unai Martinez-Corral <umartinezcorral@antmicro.com>
This commit is contained in:
Unai Martinez-Corral 2022-08-04 04:06:22 +02:00
parent 1688a97763
commit d63a2c2dbd
3 changed files with 9 additions and 29 deletions

View File

@ -1,25 +0,0 @@
#!/usr/bin/env bash
# Copyright (C) 2020-2022 F4PGA Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
FPGA_FAM="${FPGA_FAM:=xc7}"
F4PGA_INSTALL_DIR="${F4PGA_INSTALL_DIR:=/opt/f4pga}"
F4PGA_INSTALL_DIR_FAM="${F4PGA_INSTALL_DIR}/${FPGA_FAM}"
echo "FPGA_FAM: $FPGA_FAM"
echo "F4PGA_INSTALL_DIR: $F4PGA_INSTALL_DIR"
echo "F4PGA_INSTALL_DIR_FAM: $F4PGA_INSTALL_DIR_FAM"

View File

@ -29,7 +29,13 @@ echo '::endgroup::'
echo '::group::Environment variables'
source $(dirname "$0")/envvars.sh
FPGA_FAM="${FPGA_FAM:=xc7}"
F4PGA_INSTALL_DIR="${F4PGA_INSTALL_DIR:=/opt/f4pga}"
F4PGA_INSTALL_DIR_FAM="${F4PGA_INSTALL_DIR}/${FPGA_FAM}"
echo "FPGA_FAM: $FPGA_FAM"
echo "F4PGA_INSTALL_DIR: $F4PGA_INSTALL_DIR"
echo "F4PGA_INSTALL_DIR_FAM: $F4PGA_INSTALL_DIR_FAM"
echo '::endgroup::'

View File

@ -144,11 +144,10 @@ jobs:
- name: 🚧 [SymbiFlow] Test make example
if: matrix.flow == 'SymbiFlow'
run: |
. ./.github/scripts/envvars.sh
. ./.github/scripts/activate.sh
export F4PGA_BIN_DIR="$F4PGA_INSTALL_DIR_FAM"/bin/
export F4PGA_SHARE_DIR="$F4PGA_INSTALL_DIR_FAM"/share/f4pga
export F4PGA_BIN_DIR="${F4PGA_INSTALL_DIR}/${FPGA_FAM}"/bin/
export F4PGA_SHARE_DIR="${F4PGA_INSTALL_DIR}/${FPGA_FAM}"/share/f4pga
export VPRPATH=$F4PGA_BIN_DIR
echo '::group::Clone f4pga-examples'