From a5b4e80816e1e47dca4605ed6a7615de3a5aa702 Mon Sep 17 00:00:00 2001
From: Leon Lynch <lynch.leon@gmail.com>
Date: Sat, 3 Feb 2024 09:24:08 +0100
Subject: [PATCH] Update Github Actions

* Remove 32-bit builds from Windows workflow. MSYS2 has deprecated many
  32-bit packages.
* Add CLANG builds for Windows workflow
* Update to actions/checkout@v4 and actions/upload-artifact@v4

See https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/
---
 .github/workflows/fedora-build.yaml  | 6 +++---
 .github/workflows/macos-build.yaml   | 2 +-
 .github/workflows/ubuntu-build.yaml  | 6 +++---
 .github/workflows/windows-build.yaml | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/fedora-build.yaml b/.github/workflows/fedora-build.yaml
index bf4bb31..9fb7a8c 100644
--- a/.github/workflows/fedora-build.yaml
+++ b/.github/workflows/fedora-build.yaml
@@ -29,7 +29,7 @@ jobs:
         sudo dnf -y install git cmake gcc mbedtls-devel
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -69,7 +69,7 @@ jobs:
         sudo dnf -y install git cmake gcc mbedtls-devel bash-completion doxygen rpm-build
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
         submodules: recursive
@@ -98,7 +98,7 @@ jobs:
       run: cmake --build build --target package
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: tr31-${{ env.GIT_DESCRIBE }}-fedora${{ matrix.fedora_version }}
         path: build/tr31-*.rpm
diff --git a/.github/workflows/macos-build.yaml b/.github/workflows/macos-build.yaml
index 0b236d8..ed85c5e 100644
--- a/.github/workflows/macos-build.yaml
+++ b/.github/workflows/macos-build.yaml
@@ -33,7 +33,7 @@ jobs:
         echo "CMAKE_REQUIRE_FIND_PACKAGE_MbedTLS=YES" >> $GITHUB_ENV
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: recursive
     - run: git describe --always --dirty
diff --git a/.github/workflows/ubuntu-build.yaml b/.github/workflows/ubuntu-build.yaml
index 3234d4a..0d433fc 100644
--- a/.github/workflows/ubuntu-build.yaml
+++ b/.github/workflows/ubuntu-build.yaml
@@ -28,7 +28,7 @@ jobs:
         sudo apt-get install -y libmbedtls-dev
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: recursive
     - run: git describe --always --dirty
@@ -60,7 +60,7 @@ jobs:
         sudo apt-get install -y libmbedtls-dev doxygen
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
         submodules: recursive
@@ -85,7 +85,7 @@ jobs:
       run: cmake --build build --target package
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: tr31-${{ env.GIT_DESCRIBE }}-${{ matrix.os }}
         path: build/tr31_*.deb
diff --git a/.github/workflows/windows-build.yaml b/.github/workflows/windows-build.yaml
index a044656..58c1a78 100644
--- a/.github/workflows/windows-build.yaml
+++ b/.github/workflows/windows-build.yaml
@@ -19,10 +19,10 @@ jobs:
         include:
           - { sys: mingw64, env: x86_64, build_type: "Debug", lib_type: "static", shared_libs: "NO", fetch_deps: YES }
           - { sys: mingw64, env: x86_64, build_type: "Release", lib_type: "dll", shared_libs: "YES", fetch_deps: NO }
-          - { sys: mingw32, env: i686, build_type: "Debug", lib_type: "dll", shared_libs: "YES", fetch_deps: YES }
-          - { sys: mingw32, env: i686, build_type: "Release", lib_type: "static", shared_libs: "NO", fetch_deps: NO }
           - { sys: ucrt64, env: ucrt-x86_64, build_type: "Debug", lib_type: "static", shared_libs: "NO", fetch_deps: YES }
           - { sys: ucrt64, env: ucrt-x86_64, build_type: "Release", lib_type: "dll", shared_libs: "YES", fetch_deps: NO }
+          - { sys: clang64, env: clang-x86_64, build_type: "Debug", lib_type: "dll", shared_libs: "YES", fetch_deps: NO }
+          - { sys: clang64, env: clang-x86_64, build_type: "Release", lib_type: "static", shared_libs: "NO", fetch_deps: YES }
 
     name: Windows MSYS2 ${{matrix.sys}} build (${{ matrix.lib_type }}/${{ matrix.build_type }})
 
@@ -32,7 +32,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: recursive