From c6e137f7aaa0f67beb417b695f5486093377ca69 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Wed, 31 May 2023 13:57:13 +0000
Subject: [PATCH] ci: add non-static autotools i386 build, ignore GHA updates
 on AppVeyor

Add a non-static autotools build to GitHub Actions. Make this build
target i386 and libgcrypt, to test a new build combination if we are at
it.

Also:
- GHA: add necessary generic bits for i386 autotools builds.
- AppVeyor CI: teach it to ignore commits updating our GHA config.

Follow-up to 572c57c9d8d4e89cfce19dde40125d55481256d1 #1072
Closes #1074
---
 .github/workflows/ci.yml | 15 ++++++++++++++-
 appveyor.yml             |  4 ++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b20f5e4f6a..16a0aeba2e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -52,6 +52,12 @@ jobs:
             crypto: mbedTLS
             build: cmake
             zlib: 'ON'
+          - compiler: clang
+            arch: i386
+            crypto: Libgcrypt
+            build: autotools
+            zlib: 'ON'
+            options: --disable-static
     env:
       CC: ${{ matrix.compiler }}
     steps:
@@ -93,7 +99,14 @@ jobs:
         run: autoreconf -fi
       - name: 'autotools configure'
         if: ${{ matrix.build == 'autotools' }}
-        run: mkdir bld && cd bld && ../configure --enable-werror --enable-debug
+        run: |
+          if [ '${{ matrix.arch }}' = 'i386' ]; then
+            crossoptions='--host=i686-pc-linux-gnu'
+            export CFLAGS=-m32
+          fi
+          mkdir bld && cd bld && ../configure --enable-werror --enable-debug \
+            ${crossoptions} ${{ matrix.options }}
+
       - name: 'autotools build'
         if: ${{ matrix.build == 'autotools' && !matrix.target }}
         run: make -C bld -j3
diff --git a/appveyor.yml b/appveyor.yml
index 69e58ff784..5c5f3e0884 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -209,6 +209,10 @@ on_finish:
       Start-Sleep -Seconds 3
       Get-Process -Name "sshd" -ErrorAction SilentlyContinue | Stop-Process
 
+skip_commits:
+  files:
+    - '.github/**/*'
+
 # Limit branches to avoid testing feature branches twice (as branch and as pull request)
 branches:
   only: