From ab636a1ede91650f47cf6c66b2b2cd4e1a54aa41 Mon Sep 17 00:00:00 2001
From: Raul Metsma <raul@metsma.ee>
Date: Tue, 19 Mar 2024 10:09:28 +0200
Subject: [PATCH] Fix build using fixed WIX extension version

Signed-off-by: Raul Metsma <raul@metsma.ee>
---
 .github/workflows/build.yml | 44 ++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 149398812..49b4fb794 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,13 +16,13 @@ jobs:
       with:
         submodules: recursive
     - name: Download artifact
-      uses: dawidd6/action-download-artifact@v2
+      uses: actions/download-artifact@v4
       with:
         workflow: build.yml
         branch: master
         name: pkgs
         path: libdigidocpp-pkg
-        repo: open-eid/libdigidocpp
+        repository: open-eid/libdigidocpp
     - name: Install dependencies
       env:
         HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: YES
@@ -49,22 +49,22 @@ jobs:
         name: pkgs
         path: build/qdigidoc4*.zip
   ubuntu:
-    name: Build on Ubuntu to ${{ matrix.container }}
+    name: Build on Ubuntu ${{ matrix.container }}
     runs-on: ubuntu-latest
-    container: ${{ matrix.container }}
+    container: ${{ format('ubuntu:{0}', matrix.container) }}
     strategy:
       matrix:
-        container: ['ubuntu:20.04', 'ubuntu:22.04', 'ubuntu:23.10']
+        container: ['20.04', '22.04', '23.10']
     env:
       DEBIAN_FRONTEND: noninteractive
       DEBFULLNAME: github-actions
       DEBEMAIL: github-actions@github.com
     steps:
     - name: Install dependencies
-      if: matrix.container == 'ubuntu:20.04'
+      if: matrix.container == '20.04'
       run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts debhelper pkg-config cmake libldap2-dev gettext libpcsclite-dev libssl-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev lintian libflatbuffers-dev zlib1g-dev
     - name: Install dependencies
-      if: matrix.container != 'ubuntu:20.04'
+      if: matrix.container != '20.04'
       run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts debhelper pkg-config cmake libldap2-dev gettext libpcsclite-dev libssl-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libqt6core5compat6-dev lintian libflatbuffers-dev zlib1g-dev
     - name: Checkout
       uses: actions/checkout@v4
@@ -75,9 +75,9 @@ jobs:
       with:
         workflow: build.yml
         branch: master
-        name: debs
+        name: ${{ format('ubuntu_{0}', matrix.container) }}
         path: libdigidocpp-pkg
-        repo: open-eid/libdigidocpp
+        repo: metsma/libdigidocpp
     - name: Install artifact
       run: |
         apt install --no-install-recommends -y ./libdigidocpp-pkg/*$(lsb_release -rs)*.deb
@@ -94,24 +94,24 @@ jobs:
     - name: Lintian
       run: lintian *.deb;
     - name: Archive artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: debs
+        name: ${{ format('ubuntu_{0}', matrix.container) }}
         path: qdigidoc4*.*
   fedora:
-    name: Build on Fedora to ${{ matrix.container }}
+    name: Build on Fedora ${{ matrix.container }}
     runs-on: ubuntu-latest
-    container: ${{ matrix.container }}
+    container: ${{ format('fedora:{0}', matrix.container) }}
     strategy:
       matrix:
-        container: ['fedora:38', 'fedora:39']
+        container: [38, 39]
     steps:
     - name: Install Deps
       run: |
         dnf install -y --setopt=install_weak_deps=False \
         git gcc-c++ cmake rpm-build gettext openssl-devel openldap-devel pcsc-lite-devel qt6-qtsvg-devel qt6-qttools-devel qt6-qt5compat-devel flatbuffers-devel flatbuffers-compiler zlib-devel
     - name: Install CMake
-      if: matrix.container == 'fedora:39'
+      if: matrix.container == 39
       run: |
         dnf install -y --setopt=install_weak_deps=False wget
         wget -q https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1-linux-x86_64.sh
@@ -124,22 +124,22 @@ jobs:
       uses: dawidd6/action-download-artifact@v2
       with:
         workflow: build.yml
-        branch: master
-        name: rpms
+        branch: wix
+        name: ${{ format('fedora_{0}', matrix.container) }}
         path: libdigidocpp-pkg
-        repo: open-eid/libdigidocpp
+        repo: metsma/libdigidocpp
     - name: Install artifact
       run: |
         . /etc/os-release
-        dnf install -y ./libdigidocpp-pkg/*fc${VERSION_ID}*.rpm
+        dnf install -y ./libdigidocpp-pkg/*.rpm
     - name: Build
       run: |
         cmake -DCMAKE_INSTALL_PREFIX=/usr -B build -S .
         cmake --build build --target all package
     - name: Archive artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: rpms
+        name: ${{ format('fedora_{0}', matrix.container) }}
         path: build/qdigidoc4*.rpm
   windows:
     name: Build on Windows
@@ -191,7 +191,7 @@ jobs:
     - name: Install WiX
       run: |
         dotnet tool install --global wix
-        wix extension -g add WixToolset.UI.wixext
+        wix extension -g add WixToolset.UI.wixext/4.0.4
     - name: Build
       run: |
         md build/client