Skip to content

Commit

Permalink
Fix build using fixed WIX extension version
Browse files Browse the repository at this point in the history
Signed-off-by: Raul Metsma <[email protected]>
  • Loading branch information
metsma committed Mar 19, 2024
1 parent f3e81b5 commit ab636a1
Showing 1 changed file with 22 additions and 22 deletions.
44 changes: 22 additions & 22 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: [email protected]
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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit ab636a1

Please sign in to comment.