Revert "fix" for curl in Github Actions

It doesn't work.
This commit is contained in:
Leonid Pliushch 2021-05-26 16:44:34 +03:00
parent 0b3b3e063a
commit 719957fa2a
No known key found for this signature in database
GPG Key ID: 45F2964132545795
3 changed files with 1 additions and 21 deletions

View File

@ -20,10 +20,6 @@ jobs:
matrix:
target_arch: [aarch64, arm, i686, x86_64]
steps:
- name: Disable checksum offload
# https://github.com/actions/virtual-environments/issues/1187#issuecomment-686735760
# fix for curl timeout
run: sudo ethtool -K eth0 tx off rx off
- name: Clone repository
uses: actions/checkout@v2
with:
@ -119,7 +115,7 @@ jobs:
if [ -f ./built_packages.txt ]; then
./scripts/lint-packages.sh $(cat ./built_packages.txt | awk '{print "packages/"$1"/build.sh"}')
./scripts/run-docker.sh ./build-package.sh -a ${{ matrix.target_arch }} -I $(cat ./built_packages.txt)
./scripts/run-docker.sh ./build-package.sh -a ${{ matrix.target_arch }} $(cat ./built_packages.txt)
fi
test -d ./termux-packages/debs && mv ./termux-packages/debs/* ./debs/

View File

@ -3,8 +3,6 @@ set -e -u
CONTAINER_HOME_DIR=/home/builder
UNAME=$(uname)
: ${GITHUB_ACTIONS:="false"}
if [ "$UNAME" = Darwin ]; then
# Workaround for mac readlink not supporting -f.
REPOROOT=$PWD
@ -33,15 +31,8 @@ else
fi
$SUDO docker start $CONTAINER_NAME >/dev/null 2>&1 || {
if [ "$GITHUB_ACTIONS" = "true" ]; then
SECURITY_OPT="--cap-add SYS_ADMIN --cap-add NET_ADMIN --security-opt apparmor:unconfined --security-opt seccomp=unconfined"
else
SECURITY_OPT=""
fi
echo "Creating new container..."
$SUDO docker run \
$SECURITY_OPT \
--detach \
--name $CONTAINER_NAME \
--volume $REPOROOT:$CONTAINER_HOME_DIR/termux-packages \
@ -58,10 +49,6 @@ $SUDO docker start $CONTAINER_NAME >/dev/null 2>&1 || {
fi
}
if [ "$GITHUB_ACTIONS" = "true" ]; then
$SUDO docker exec $DOCKER_TTY $CONTAINER_NAME sudo ethtool -K eth0 tx off rx off
fi
if [ "$#" -eq "0" ]; then
$SUDO docker exec --interactive $DOCKER_TTY $CONTAINER_NAME bash
else

View File

@ -3,9 +3,6 @@ set -e -u
PACKAGES=""
# For fixing networking interface when running on Github Actions.
PACKAGES+=" ethtool"
# For en_US.UTF-8 locale.
PACKAGES+=" locales"