diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 10c4c946e..da7397f29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -159,6 +159,7 @@ jobs: echo "EM_CONFIG=$HOME/emsdk/.emscripten" >> "$GITHUB_ENV" echo "INBE_NODE_BIN=$(dirname "$(command -v node)")" >> "$GITHUB_ENV" echo "$HOME/emsdk/upstream/emscripten" >> "$GITHUB_PATH" + bash scripts/ensure-emscripten-zlib.sh "$HOME/emsdk/upstream/emscripten/embuilder" - name: Build Chrome Extension ZIP run: | @@ -225,6 +226,7 @@ jobs: echo "EM_CONFIG=$HOME/emsdk/.emscripten" >> "$GITHUB_ENV" echo "INBE_NODE_BIN=$(dirname "$(command -v node)")" >> "$GITHUB_ENV" echo "$HOME/emsdk/upstream/emscripten" >> "$GITHUB_PATH" + bash scripts/ensure-emscripten-zlib.sh "$HOME/emsdk/upstream/emscripten/embuilder" - name: Build Firefox Add-on ZIP run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1ff580b34..45a2645d8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -114,6 +114,7 @@ jobs: echo "EM_CONFIG=$HOME/emsdk/.emscripten" >> "$GITHUB_ENV" echo "INBE_NODE_BIN=$(dirname "$(command -v node)")" >> "$GITHUB_ENV" echo "$HOME/emsdk/upstream/emscripten" >> "$GITHUB_PATH" + bash scripts/ensure-emscripten-zlib.sh "$HOME/emsdk/upstream/emscripten/embuilder" - name: Build Web ZIP run: | @@ -175,6 +176,7 @@ jobs: echo "EM_CONFIG=$HOME/emsdk/.emscripten" >> "$GITHUB_ENV" echo "INBE_NODE_BIN=$(dirname "$(command -v node)")" >> "$GITHUB_ENV" echo "$HOME/emsdk/upstream/emscripten" >> "$GITHUB_PATH" + bash scripts/ensure-emscripten-zlib.sh "$HOME/emsdk/upstream/emscripten/embuilder" - name: Build Chrome Extension ZIP run: | @@ -236,6 +238,7 @@ jobs: echo "EM_CONFIG=$HOME/emsdk/.emscripten" >> "$GITHUB_ENV" echo "INBE_NODE_BIN=$(dirname "$(command -v node)")" >> "$GITHUB_ENV" echo "$HOME/emsdk/upstream/emscripten" >> "$GITHUB_PATH" + bash scripts/ensure-emscripten-zlib.sh "$HOME/emsdk/upstream/emscripten/embuilder" - name: Build Firefox Add-on ZIP run: | diff --git a/scripts/ensure-emscripten-zlib.sh b/scripts/ensure-emscripten-zlib.sh new file mode 100644 index 000000000..f2ec30f59 --- /dev/null +++ b/scripts/ensure-emscripten-zlib.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash +set -euo pipefail + +embuilder=${1:-embuilder} +for attempt in 1 2 3; do + if "$embuilder" build zlib; then + exit 0 + fi + if [ "$attempt" -eq 3 ]; then + echo "Emscripten zlib port could not be fetched after 3 attempts" >&2 + exit 1 + fi + sleep $((attempt * 10)) +done