mirror of
https://github.com/openhwgroup/cvw.git
synced 2025-06-27 08:50:26 -04:00
Fix a few more issues with new installation method
This commit is contained in:
parent
12b203032f
commit
03bf608a0c
3 changed files with 51 additions and 46 deletions
4
.github/workflows/install.yml
vendored
4
.github/workflows/install.yml
vendored
|
@ -149,7 +149,7 @@ jobs:
|
|||
# Update setup.sh if using a custom $RISCV path
|
||||
- name: Update setup.sh
|
||||
if: ${{ matrix.riscv_path != null }}
|
||||
run: sed -i 's,/opt/riscv,${{ matrix.riscv_path }},g' setup.sh
|
||||
run: sed -i 's,~/riscv,${{ matrix.riscv_path }},g' setup.sh
|
||||
# Upload installation logs for debugging
|
||||
- name: Upload Installation Logs
|
||||
uses: actions/upload-artifact@v4
|
||||
|
@ -168,7 +168,7 @@ jobs:
|
|||
- name: make tests
|
||||
run: |
|
||||
source setup.sh
|
||||
make riscof zsbl deriv --jobs $(nproc --ignore 1)
|
||||
make riscof zsbl deriv coverage --jobs $(nproc --ignore 1)
|
||||
# Run standard regression, skipping distros that are known to be broken with Verilator
|
||||
- name: Regression
|
||||
if: ${{ matrix.regressionFail != true }}
|
||||
|
|
|
@ -141,11 +141,12 @@ fi
|
|||
# Check flags
|
||||
clean=false
|
||||
no_buildroot=false
|
||||
packages_only=false
|
||||
while [[ "$#" -gt 0 ]]; do
|
||||
case $1 in
|
||||
-c|--clean) clean=true ;;
|
||||
--no-buildroot) no_buildroot=true ;;
|
||||
--no-args) ;; # Ignore this flag, workaround for sourcing this script in other scripts
|
||||
--packages-only) packages_only=true;;
|
||||
-h|--help)
|
||||
echo -e "Usage: $0 [\$RISCV] [options]"
|
||||
echo -e "${BOLD}Options:${ENDC}"
|
||||
|
@ -161,6 +162,13 @@ done
|
|||
# Check if root
|
||||
ROOT=$( [ "${EUID:=$(id -u)}" == 0 ] && echo true || echo false);
|
||||
|
||||
### Print system information ###
|
||||
echo -e "${OK_COLOR}${UNDERLINE}Detected information${ENDC}"
|
||||
echo "Distribution: $PRETTY_NAME"
|
||||
echo "Version: $VERSION"
|
||||
echo "Running as root: $ROOT"
|
||||
|
||||
if [ $packages_only != true ]; then
|
||||
# Set installation directory based on execution privileges
|
||||
# If the script is run as root, the default installation path is /opt/riscv
|
||||
# If the script is run as a user, the default installation path is ~/riscv
|
||||
|
@ -199,12 +207,9 @@ fi
|
|||
mkdir -p "$RISCV"/logs
|
||||
mkdir -p "$RISCV"/versions
|
||||
|
||||
### Print system information ###
|
||||
echo -e "${OK_COLOR}${UNDERLINE}Detected information${ENDC}"
|
||||
echo "Distribution: $PRETTY_NAME"
|
||||
echo "Version: $VERSION"
|
||||
echo "Running as root: $ROOT"
|
||||
# Print more system information
|
||||
echo "Installation path: $RISCV"
|
||||
echo "Number of cores: $(nproc)"
|
||||
echo "Total memory: $total_mem_gb GB"
|
||||
echo "Using $NUM_THREADS thread(s) for compilation"
|
||||
fi
|
||||
|
|
|
@ -36,7 +36,7 @@ if [ -z "$FAMILY" ]; then
|
|||
dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
WALLY="$(dirname "$dir")"
|
||||
export WALLY
|
||||
source "${dir}"/wally-environment-check.sh "--no-args"
|
||||
source "${dir}"/wally-environment-check.sh "--packages-only"
|
||||
fi
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue