Skip to content

Commit

Permalink
build: Attempt to mitigate apt network failues
Browse files Browse the repository at this point in the history
  • Loading branch information
jgriffiths committed Jan 13, 2023
1 parent 8d90cd1 commit 00e3df9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/wasm-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ jobs:
submodules: true

# Needed for build_wrappers.py, to extract function signatures from source code
- run: sudo apt-get install -y python3-sphinx
# We sed out azure to attempt to mitigate apt network failues.
- run: sudo sed -i 's/azure\.//' /etc/apt/sources.list

# The deps script was written for Debian (11), but works as-is on Ubuntu too
- run: sudo ../../contrib/bullseye_deps.sh
Expand Down
13 changes: 5 additions & 8 deletions contrib/bullseye_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,14 @@ export NDK_FILENAME=android-ndk-r23b-linux.zip

dpkg --add-architecture i386

apt-get update -qq
apt-get upgrade -yqq
apt install --no-install-recommends unzip autoconf automake autotools-dev pkg-config build-essential libtool python3{,-dev,-pip,-virtualenv,-distutils} python{,-dev}-is-python3 clang{,-format,-tidy} git swig openjdk-11-jdk g++-mingw-w64-x86-64 curl -yqq
update-java-alternatives -s java-1.11.0-openjdk-amd64

curl -sL https://deb.nodesource.com/setup_16.x | bash -
curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
apt-get update -qq
apt-get upgrade -qq
apt-get install -yqq nodejs yarn

apt-get update -qq -o="APT::Acquire::Retries=3"
apt-get upgrade -yqq -o="APT::Acquire::Retries=3"
apt-get install -yqq --no-install-recommends -o="APT::Acquire::Retries=3" unzip autoconf automake autotools-dev pkg-config build-essential libtool python3{,-dev,-pip,-virtualenv,-distutils,-sphinx} python{,-dev}-is-python3 clang{,-format,-tidy} git swig openjdk-11-jdk g++-mingw-w64-x86-64 curl nodejs yarn
update-java-alternatives -s java-1.11.0-openjdk-amd64

cd /opt && curl -sSO https://dl.google.com/android/repository/${NDK_FILENAME}
unzip -qq ${NDK_FILENAME}
Expand Down

0 comments on commit 00e3df9

Please sign in to comment.