mirror of
https://github.com/Orange-OpenSource/hurl.git
synced 2024-10-03 18:48:09 +03:00
Simplify install prerequisites scripts
This commit is contained in:
parent
8aba7c2bef
commit
c1117b5391
2
.github/workflows/extra-package.yml
vendored
2
.github/workflows/extra-package.yml
vendored
@ -102,7 +102,7 @@ jobs:
|
||||
run: |
|
||||
set -e
|
||||
echo "::group::Install Prerequisites"
|
||||
bin/install_prerequisites_docker_ubuntu.sh
|
||||
bin/install_prerequisites_ubuntu.sh
|
||||
sudo apt-get install -y g++-aarch64-linux-gnu libc6-dev-arm64-cross
|
||||
./bin/export_cross_compile_env.sh
|
||||
echo "::endgroup::"
|
||||
|
6
.github/workflows/package.yml
vendored
6
.github/workflows/package.yml
vendored
@ -77,7 +77,7 @@ jobs:
|
||||
run: |
|
||||
set -e
|
||||
echo "::group::Install system prerequisites"
|
||||
bin/install_prerequisites_docker_ubuntu.sh
|
||||
bin/install_prerequisites_ubuntu.sh
|
||||
echo "::endgroup::"
|
||||
echo "::group::Install python3 venv"
|
||||
bin/install_python3_venv.sh
|
||||
@ -128,7 +128,7 @@ jobs:
|
||||
run: |
|
||||
set -e
|
||||
echo "::group::Install system prerequisites"
|
||||
bin/install_prerequisites_docker_ubuntu.sh
|
||||
bin/install_prerequisites_ubuntu.sh
|
||||
echo "::endgroup::"
|
||||
echo "::group::Install python3 venv"
|
||||
bin/install_python3_venv.sh
|
||||
@ -230,7 +230,7 @@ jobs:
|
||||
run: |
|
||||
set -e
|
||||
echo "::group::Install system prerequisites"
|
||||
bin/install_prerequisites_docker_fedora.sh
|
||||
bin/install_prerequisites_fedora.sh
|
||||
echo "::endgroup::"
|
||||
echo "::group::Install python3 venv"
|
||||
bin/install_python3_venv.sh
|
||||
|
2
.github/workflows/test.yml
vendored
2
.github/workflows/test.yml
vendored
@ -200,7 +200,7 @@ jobs:
|
||||
run: |
|
||||
set -e
|
||||
echo "::group::Install Prerequisites"
|
||||
bin/install_prerequisites_docker_fedora.sh
|
||||
bin/install_prerequisites_fedora.sh
|
||||
echo "::endgroup::"
|
||||
echo "::group::Install python3 venv"
|
||||
bin/install_python3_venv.sh
|
||||
|
@ -3,6 +3,23 @@ set -Eeuo pipefail
|
||||
|
||||
echo "----- install prerequisite packages -----"
|
||||
apk update --quiet
|
||||
apk add --quiet sudo bash sudo netcat-openbsd curl curl-dev build-base libidn2 libffi-dev libxml2-dev libxml2-utils openssl-dev python3 python3-dev py3-pip cargo squid jq
|
||||
apk add --quiet \
|
||||
bash \
|
||||
sudo \
|
||||
netcat-openbsd \
|
||||
curl \
|
||||
curl-dev \
|
||||
build-base \
|
||||
libidn2 \
|
||||
libffi-dev \
|
||||
libxml2-dev \
|
||||
libxml2-utils \
|
||||
openssl-dev \
|
||||
python3 \
|
||||
python3-dev \
|
||||
py3-pip \
|
||||
cargo \
|
||||
squid \
|
||||
jq
|
||||
sudo squid -k shutdown || true
|
||||
sudo rm -v /dev/shm/squid*.shm >/dev/null 2>&1 || true
|
||||
|
@ -2,7 +2,19 @@
|
||||
set -Eeuo pipefail
|
||||
|
||||
echo "----- install prerequisite packages -----"
|
||||
pacman -Sy --noconfirm bash sudo openssl python3 python-pip icu base-devel libxml2 glibc openbsd-netcat squid jq
|
||||
pacman -Sy --noconfirm \
|
||||
bash \
|
||||
sudo \
|
||||
openssl \
|
||||
python3 \
|
||||
python-pip \
|
||||
icu \
|
||||
base-devel \
|
||||
libxml2 \
|
||||
glibc \
|
||||
openbsd-netcat \
|
||||
squid \
|
||||
jq
|
||||
# Temporary install to patch a python3/pip crash
|
||||
pacman -Sy --noconfirm expat
|
||||
sudo squid -k shutdown || true
|
||||
|
@ -1,8 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -Eeuo pipefail
|
||||
|
||||
echo "----- install prerequisite packages -----"
|
||||
yum install -y sudo which python3 python3-pip procps gcc libxml2-devel openssl-devel libcurl-devel nc squid jq
|
||||
sudo squid -k shutdown || true
|
||||
sudo rm -v /dev/shm/squid*.shm >/dev/null 2>&1 || true
|
||||
|
@ -1,27 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -Eeuo pipefail
|
||||
|
||||
echo "----- install prerequisite packages -----"
|
||||
apt-get update
|
||||
apt-get -y install \
|
||||
bash \
|
||||
sudo \
|
||||
curl \
|
||||
g++-aarch64-linux-gnu \
|
||||
libc6-dev-arm64-cross \
|
||||
libxml2-dev \
|
||||
pkg-config \
|
||||
libcurl4-openssl-dev \
|
||||
libxml2-utils \
|
||||
libxml2-dev \
|
||||
libssl-dev \
|
||||
python3 \
|
||||
python3-pip \
|
||||
python3-venv \
|
||||
netcat-openbsd \
|
||||
squid \
|
||||
jq
|
||||
sudo service squid stop
|
||||
sudo squid -k shutdown || true
|
||||
sudo rm -v /dev/shm/squid*.shm >/dev/null 2>&1 || true
|
||||
|
@ -2,7 +2,21 @@
|
||||
set -Eeuo pipefail
|
||||
|
||||
echo "----- install prerequisite packages -----"
|
||||
yum install -y bash sudo procps gcc libxml2-devel openssl-devel libcurl-devel python3-devel python3-pip nc squid jq
|
||||
yum install -y \
|
||||
bash \
|
||||
sudo \
|
||||
which \
|
||||
python3 \
|
||||
procps \
|
||||
gcc \
|
||||
libxml2-devel \
|
||||
openssl-devel \
|
||||
libcurl-devel \
|
||||
python3-devel \
|
||||
python3-pip \
|
||||
nc \
|
||||
squid \
|
||||
jq
|
||||
sudo squid -k shutdown || true
|
||||
sudo rm -v /dev/shm/squid*.shm >/dev/null 2>&1 || true
|
||||
|
||||
|
@ -2,8 +2,29 @@
|
||||
set -Eeuo pipefail
|
||||
|
||||
echo "----- install prerequisite packages -----"
|
||||
if ! command -V sudo ; then
|
||||
apt-get update
|
||||
apt-get -y install sudo
|
||||
fi
|
||||
sudo apt-get update
|
||||
sudo apt-get -y install bash libcurl4-openssl-dev libxml2-utils netcat-openbsd python3 python3-pip python3-venv net-tools squid jq
|
||||
sudo apt-get -y install \
|
||||
bash \
|
||||
curl \
|
||||
net-tools \
|
||||
g++-aarch64-linux-gnu \
|
||||
libc6-dev-arm64-cross \
|
||||
libxml2-dev \
|
||||
pkg-config \
|
||||
libcurl4-openssl-dev \
|
||||
libxml2-utils \
|
||||
libxml2-dev \
|
||||
libssl-dev \
|
||||
python3 \
|
||||
python3-pip \
|
||||
python3-venv \
|
||||
netcat-openbsd \
|
||||
squid \
|
||||
jq
|
||||
sudo service squid stop || true
|
||||
sudo squid -k shutdown || true
|
||||
sudo rm -v /dev/shm/squid*.shm >/dev/null 2>&1 || true
|
||||
|
@ -49,7 +49,7 @@ docker run --platform linux/arm64 --volume /tmp/hurl-"${tag}":/hurl --workdir /h
|
||||
uname -m
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
apt update
|
||||
bin/install_prerequisites_docker_ubuntu.sh
|
||||
bin/install_prerequisites_ubuntu.sh
|
||||
```
|
||||
|
||||
## Build
|
||||
|
Loading…
Reference in New Issue
Block a user