fixup! Keep i386 alive and add ARM builds

AppImageCommunity · Dec 10, 2023 · 953b84a · 953b84a
1 parent ef57f6b
commit 953b84a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ARCH: [x86_64, aarch64, armhf]
+        ARCH: [x86_64, i686, aarch64, armhf]
 
     name: AppImage ${{ matrix.ARCH }}
     runs-on: ubuntu-20.04

diff --git a/ci/build-in-docker.sh b/ci/build-in-docker.sh
@@ -35,18 +35,18 @@ repo_root="$(readlink -f "$(dirname "${BASH_SOURCE[0]}")"/..)"
 uid="$(id -u)"
 image=zsync2-build:"$ARCH"
 
-tty_args=()
-if [ -t 0 ]; then tty_args+=("-t"); fi
-
 # building local image to "cache" installed dependencies for subsequent builds
 docker build \
     "${tty_args[@]}" \
-    "$image" \
+    -t "$image" \
     --build-arg ARCH="$ARCH" \
     --build-arg DOCKER_ARCH="$DOCKER_ARCH" \
     --build-arg CMAKE_ARCH="$CMAKE_ARCH" \
     "$repo_root"/ci
 
+tty_args=()
+if [ -t 0 ]; then tty_args+=("-t"); fi
+
 # mount workspace read-only, trying to make sure the build doesn't ever touch the source code files
 # of course, this only works reliably if you don't run this script from that directory
 # but it's still not the worst idea to do so