From 921809cab936fe6f96f245a3a1535adcd078e4b0 Mon Sep 17 00:00:00 2001
From: Ben Jackson <puremourning@gmail.com>
Date: Mon, 6 Feb 2023 21:48:22 +0000
Subject: [PATCH] Build containers for current architecture

---
 .github/workflows/ci.yml            |  3 ++-
 test/docker/ci/image/Dockerfile     | 10 ----------
 test/docker/ci/push                 |  4 +++-
 test/docker/ci/rebuild              |  4 +++-
 test/docker/manual/image/Dockerfile |  3 ++-
 test/docker/manual/push             |  4 +++-
 test/docker/manual/rebuild          |  5 ++++-
 test/docker/manual/run              |  3 ++-
 8 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b3524bd6..3d74a70f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -52,8 +52,9 @@ jobs:
       fail-fast: false
       matrix:
         vim: [ 'new', 'old' ]
+        arch: [ 'x86_64' ]
     runs-on: ubuntu-20.04
-    container: 'youcompleteme/ycm-vim-py3:test'
+    container: 'youcompleteme/ycm-vim-${{ matrix.arch }}-py3:test'
     env:
       COVERAGE: true
       YCM_TEST_STDOUT: true
diff --git a/test/docker/ci/image/Dockerfile b/test/docker/ci/image/Dockerfile
index eb068910..a3eb94d4 100644
--- a/test/docker/ci/image/Dockerfile
+++ b/test/docker/ci/image/Dockerfile
@@ -44,20 +44,10 @@ RUN mkdir -p $HOME/vim && \
     make -j 4 && \
     make install
 
-# linuxbrew (homebrew)
-RUN mkdir -p /home/linuxbrew/.linuxbrew &&\
-    chmod -R go+rwx /home/linuxbrew && \
-    mkdir -p /home/linuxbrew/.linuxbrew/bin && \
-    git clone  https://github.com/Homebrew/brew /home/linuxbrew/.linuxbrew/Homebrew && \
-    ln -s /home/linuxbrew/.linuxbrew/Homebrew/bin/brew /home/linuxbrew/.linuxbrew/bin && \
-    echo "eval \$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" \
-        > /etc/bash.bashrc
-
 # Python
 RUN ${YCM_VIM_PYTHON} -m pip install --upgrade pip setuptools wheel
 
 # clean up
 RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* &&\
-    /home/linuxbrew/.linuxbrew/bin/brew cleanup && \
     rm -rf ~/.cache && \
     rm -rf $HOME/vim
diff --git a/test/docker/ci/push b/test/docker/ci/push
index 31a8481d..e80761df 100755
--- a/test/docker/ci/push
+++ b/test/docker/ci/push
@@ -2,4 +2,6 @@
 
 set -e
 
-docker push youcompleteme/ycm-vim-py3:test
+ARCH=$(uname -m)
+
+docker push youcompleteme/ycm-vim-${ARCH}-py3:test
diff --git a/test/docker/ci/rebuild b/test/docker/ci/rebuild
index 6b384ad0..f2bb308b 100755
--- a/test/docker/ci/rebuild
+++ b/test/docker/ci/rebuild
@@ -8,6 +8,8 @@ else
   OPTS="--no-cache"
 fi
 
-docker build ${OPTS} -t youcompleteme/ycm-vim-py3:test \
+ARCH=$(uname -m)
+
+docker build ${OPTS} -t youcompleteme/ycm-vim-${ARCH}-py3:test \
                      --build-arg YCM_VIM_PYTHON=python3 \
                      image/
diff --git a/test/docker/manual/image/Dockerfile b/test/docker/manual/image/Dockerfile
index 11609aa3..5d6f234a 100644
--- a/test/docker/manual/image/Dockerfile
+++ b/test/docker/manual/image/Dockerfile
@@ -1,6 +1,7 @@
 ARG YCM_PYTHON=py3
+ARG ARCH=x86_64
 
-FROM youcompleteme/ycm-vim-${YCM_PYTHON}:test
+FROM youcompleteme/ycm-vim-${ARCH}-${YCM_PYTHON}:test
 
 RUN apt-get update && \
   apt-get -y --no-install-recommends install less && \
diff --git a/test/docker/manual/push b/test/docker/manual/push
index ee32addf..63c1ddd1 100755
--- a/test/docker/manual/push
+++ b/test/docker/manual/push
@@ -2,4 +2,6 @@
 
 set -e
 
-docker push youcompleteme/ycm-vim-py3:manual
+ARCH=$(uname -m)
+
+docker push youcompleteme/ycm-vim-${ARCH}-py3:manual
diff --git a/test/docker/manual/rebuild b/test/docker/manual/rebuild
index 9c7f3916..4809cae4 100755
--- a/test/docker/manual/rebuild
+++ b/test/docker/manual/rebuild
@@ -8,6 +8,9 @@ else
   OPTS="--no-cache"
 fi
 
-docker build ${OPTS} -t youcompleteme/ycm-vim-py3:manual \
+ARCH=$(uname -m)
+
+docker build ${OPTS} -t youcompleteme/ycm-vim-${ARCH}-py3:manual \
                      --build-arg YCM_PYTHON=py3 \
+                     --build-arg ARCH=${ARCH} \
                      image/
diff --git a/test/docker/manual/run b/test/docker/manual/run
index 860f0028..b44db554 100755
--- a/test/docker/manual/run
+++ b/test/docker/manual/run
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-CONTAINER=youcompleteme/ycm-vim-py3:manual
+ARCH=$(uname -m)
+CONTAINER=youcompleteme/ycm-vim-${ARCH}-py3:manual
 
 pushd $(dirname $0)
   docker run --mount src="$(pwd)/../../../",target=/home/dev/YouCompleteMe,type=bind \
-- 
2.39.1