Skip to content

Fix CI issue #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 3, 2024
Merged

Fix CI issue #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c9798c
Update setup_deb.sh
jan-grzybek-ampere Oct 3, 2024
be80553
Update setup_rhel.sh
jan-grzybek-ampere Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions setup_deb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ log "Installing python dependencies ..."
sleep 1

# get almost all python deps
pip3 install --break-system-packages --upgrade -r "$(dirname "$0")/requirements.txt" ||
pip3 install --upgrade -r "$(dirname "$0")/requirements.txt"
pip3 install --break-system-packages -r "$(dirname "$0")/requirements.txt" ||
pip3 install -r "$(dirname "$0")/requirements.txt"

apt install -y autoconf autogen automake build-essential libasound2-dev \
libflac-dev libogg-dev libtool libvorbis-dev libopus-dev libmp3lame-dev \
Expand All @@ -79,8 +79,8 @@ git clone -b 1.2.2 https://github.com/libsndfile/libsndfile.git && cd libsndfile

# if [ "$(PYTHONPATH=$SCRIPT_DIR python3 -c 'from cpuinfo import get_cpu_info; from benchmark import which_ampere_cpu; cpu = which_ampere_cpu(get_cpu_info()["flags"], 1); print("AmpereOne" in cpu)')" == "True" ]; then
# # Only on AmpereOne family
# pip3 install --break-system-packages --upgrade -r "$(dirname "$0")/requirements-ampereone.txt" ||
# pip3 install --upgrade -r "$(dirname "$0")/requirements-ampereone.txt"
# pip3 install --break-system-packages -r "$(dirname "$0")/requirements-ampereone.txt" ||
# pip3 install -r "$(dirname "$0")/requirements-ampereone.txt"
# fi

ARCH=$ARCH python3 "$SCRIPT_DIR"/utils/setup/install_frameworks.py
Expand Down
8 changes: 4 additions & 4 deletions setup_rhel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@ log "Installing python dependencies ..."
sleep 1

# get almost all python deps
pip3 install --break-system-packages --upgrade -r "$(dirname "$0")/requirements.txt" ||
pip3 install --upgrade -r "$(dirname "$0")/requirements.txt"
pip3 install --break-system-packages -r "$(dirname "$0")/requirements.txt" ||
pip3 install -r "$(dirname "$0")/requirements.txt"

yum install -y autoconf automake alsa-lib-devel pkg-config

# if [ "$(PYTHONPATH=$SCRIPT_DIR python3 -c 'from cpuinfo import get_cpu_info; from benchmark import which_ampere_cpu; cpu = which_ampere_cpu(get_cpu_info()["flags"], 1); print("AmpereOne" in cpu)')" == "True" ]; then
# # Only on AmpereOne family
# pip3 install --break-system-packages --upgrade -r "$(dirname "$0")/requirements-ampereone.txt" ||
# pip3 install --upgrade -r "$(dirname "$0")/requirements-ampereone.txt"
# pip3 install --break-system-packages -r "$(dirname "$0")/requirements-ampereone.txt" ||
# pip3 install -r "$(dirname "$0")/requirements-ampereone.txt"
# fi

ARCH=$ARCH python3 "$SCRIPT_DIR"/utils/setup/install_frameworks.py
Expand Down