diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b657835c2b..0aa48dea4c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -26,9 +26,7 @@ jobs: - name: Setup ubuntu container run: | apt update -yqq - apt install -yqq build-essential make software-properties-common - add-apt-repository -y ppa:git-core/candidate - apt update -yqq && apt install -yqq git zip unzip zlib1g-dev zlib1g yasm curl sudo + apt install -yqq build-essential make git zip unzip zlib1g-dev zlib1g yasm curl sudo - name: Check out code uses: actions/checkout@v4.1.1 @@ -61,15 +59,24 @@ jobs: - name: Install dependencies run: | - apt update \ - && apt install -yqq software-properties-common curl apt-transport-https lsb-release \ - && curl -fsSl https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \ - && add-apt-repository "deb https://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-14 main" \ - && apt update \ - && apt -yqq install \ - nasm clang-14 clang-tools-14 lld-14 build-essential pkg-config autoconf git python3 \ - gcc-mingw-w64 libgcc-9-dev-arm64-cross mingw-w64-tools gcc-mingw-w64-x86-64 \ - build-essential pkg-config autoconf git xxd netcat-openbsd libnuma-dev cmake + apt update + apt install -yqq ca-certificates curl lsb-release + + if ! apt-cache show clang-14 >/dev/null 2>&1; then + install -d -m 0755 /usr/share/keyrings + curl -fsSL --retry 5 --retry-delay 2 --connect-timeout 15 \ + -o /usr/share/keyrings/apt.llvm.org.asc \ + https://apt.llvm.org/llvm-snapshot.gpg.key + printf '%s\n' \ + "deb [signed-by=/usr/share/keyrings/apt.llvm.org.asc] https://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-14 main" \ + > /etc/apt/sources.list.d/llvm-toolchain-14.list + apt update + fi + + apt install -yqq \ + nasm clang-14 clang-tools-14 lld-14 build-essential pkg-config autoconf git python3 \ + gcc-mingw-w64 libgcc-9-dev-arm64-cross mingw-w64-tools gcc-mingw-w64-x86-64 \ + xxd netcat-openbsd libnuma-dev cmake update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 30 \ && update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 30 \ @@ -91,7 +98,7 @@ jobs: - name: Download ML model run: | - curl -L https://github.com/livepeer/livepeer-ml/releases/latest/download/tasmodel.pb --output ./ffmpeg/tasmodel.pb + curl -fsSL --retry 5 --retry-delay 2 --connect-timeout 15 https://github.com/livepeer/livepeer-ml/releases/latest/download/tasmodel.pb --output ./ffmpeg/tasmodel.pb - name: Test shell: bash diff --git a/install_ffmpeg.sh b/install_ffmpeg.sh index 55108ab75c..f1aebd1db8 100755 --- a/install_ffmpeg.sh +++ b/install_ffmpeg.sh @@ -127,7 +127,7 @@ if [[ "$GOOS" != "windows" && "$GOARCH" == "amd64" ]]; then if [[ ! -e "$ROOT/nasm-2.14.02" ]]; then # sudo apt-get -y install asciidoc xmlto # this fails :( cd "$ROOT" - curl -o nasm-2.14.02.tar.gz "https://gstreamer.freedesktop.org/src/mirror/nasm-2.14.02.tar.xz" + curl -fsSL --retry 5 --retry-delay 2 --connect-timeout 15 -o nasm-2.14.02.tar.gz "https://gstreamer.freedesktop.org/src/mirror/nasm-2.14.02.tar.xz" echo 'e24ade3e928f7253aa8c14aa44726d1edf3f98643f87c9d72ec1df44b26be8f5 nasm-2.14.02.tar.gz' >nasm-2.14.02.tar.gz.sha256 sha256sum -c nasm-2.14.02.tar.gz.sha256 tar xf nasm-2.14.02.tar.gz @@ -156,7 +156,8 @@ fi if [[ ! -e "$ROOT/zlib-1.2.11" ]]; then cd "$ROOT" - curl -o zlib-1.2.11.tar.gz https://zlib.net/fossils/zlib-1.2.11.tar.gz + curl -fsSL --retry 5 --retry-delay 2 --connect-timeout 15 -o zlib-1.2.11.tar.gz https://github.com/madler/zlib/archive/refs/tags/v1.2.11.tar.gz + echo '629380c90a77b964d896ed37163f5c3a34f6e6d897311f1df2a7016355c45eff zlib-1.2.11.tar.gz' | sha256sum -c tar xf zlib-1.2.11.tar.gz cd zlib-1.2.11 ./configure --prefix="$ROOT/compiled" --static