From e038e7fcc1c9bd4015e51f0a8d618af098fcdbee Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Thu, 28 Sep 2023 14:03:22 +0200
Subject: [PATCH] Revert "Re-enable x86 tests"

This reverts commit 71a05b2c91834f981dddcdf427c3856a4169e568.
---
 .github/workflows/dendrite.yml | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/dendrite.yml b/.github/workflows/dendrite.yml
index 67ad04d0a..772b45cb2 100644
--- a/.github/workflows/dendrite.yml
+++ b/.github/workflows/dendrite.yml
@@ -81,11 +81,6 @@ jobs:
     timeout-minutes: 10
     name: Unit tests
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        goos: [ "linux" ]
-        goarch: [ "amd64", "386" ]
     # Service containers to run with `container-job`
     services:
       # Label used to access the service container
@@ -115,16 +110,14 @@ jobs:
         with:
           go-version: "stable"
       - uses: actions/cache@v3
+        # manually set up caches, as they otherwise clash with different steps using setup-go with cache=true
         with:
           path: |
             ~/.cache/go-build
             ~/go/pkg/mod
-          key: ${{ runner.os }}-go-stable-unit-${{ matrix.goos }}-${{ matrix.goarch }}-${{ hashFiles('**/go.sum') }}
+          key: ${{ runner.os }}-go-stable-unit-${{ hashFiles('**/go.sum') }}
           restore-keys: |
-            key: ${{ runner.os }}-go-stable-unit-${{ matrix.goos }}-${{ matrix.goarch }}-
-      - name: Install dependencies x86
-        if: ${{ matrix.goarch == '386' }}
-        run: sudo apt update && sudo apt-get install -y gcc-multilib
+            ${{ runner.os }}-go-stable-unit-
       - name: Set up gotestfmt
         uses: gotesttools/gotestfmt-action@v2
         with:
@@ -132,8 +125,6 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
       - run: go test -json -v ./... 2>&1 | gotestfmt -hide all
         env:
-          GOOS: ${{ matrix.goos }}
-          GOARCH: ${{ matrix.goarch }}
           POSTGRES_HOST: localhost
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres