From f2b9bb76bb3f8f9d4ddc765068f3ff9e936d5420 Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Thu, 15 Dec 2022 14:40:49 +0200 Subject: [PATCH] Update version number (#1142) IB-7389 Signed-off-by: Raul Metsma Signed-off-by: Raul Metsma --- .github/workflows/build.yml | 34 ++++++++++++++++------------------ CMakeLists.txt | 2 +- client/Diagnostics.cpp | 1 + 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1a9ea7179..e8c2c34f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,7 @@ name: CI on: [push, pull_request] +permissions: + contents: read env: BUILD_NUMBER: ${{ github.run_number }} MAKEFLAGS: -j3 @@ -8,7 +10,7 @@ jobs: name: Build on macOS runs-on: macos-latest env: - MACOSX_DEPLOYMENT_TARGET: 10.14 + MACOSX_DEPLOYMENT_TARGET: 10.15 steps: - name: Checkout uses: actions/checkout@v3 @@ -51,22 +53,22 @@ jobs: container: ${{ matrix.container }} strategy: matrix: - container: ['ubuntu:20.04', 'ubuntu:22.04'] + container: ['ubuntu:20.04', 'ubuntu:22.04', 'ubuntu:22.10'] env: DEBIAN_FRONTEND: noninteractive DEBFULLNAME: github-actions DEBEMAIL: github-actions@github.com steps: + - name: Install dependencies + if: matrix.container == 'ubuntu:20.04' + run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts cdbs pkg-config cmake libldap2-dev gettext libpcsclite-dev libssl-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev lintian + - name: Install dependencies + if: matrix.container != 'ubuntu:20.04' + run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts cdbs 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 - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v3 with: submodules: recursive - - name: Install dependencies - if: matrix.container != 'ubuntu:22.04' - run: apt update -qq && apt install --no-install-recommends -y lsb-release fakeroot build-essential devscripts cdbs pkg-config cmake libldap2-dev gettext libpcsclite-dev libssl-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev lintian - - name: Install dependencies - if: matrix.container == 'ubuntu:22.04' - run: apt update -qq && apt install --no-install-recommends -y lsb-release fakeroot build-essential devscripts cdbs 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 - name: Download artifact uses: dawidd6/action-download-artifact@v2 with: @@ -101,20 +103,16 @@ jobs: container: ${{ matrix.container }} strategy: matrix: - container: ['fedora:35', 'fedora:36'] + container: ['fedora:36', 'fedora:37'] env: MAKEFLAGS: -j3 steps: + - name: Install Deps + run: dnf install -y git gcc-c++ cmake rpm-build gettext openssl-devel openldap-devel pcsc-lite-devel qt6-qtsvg-devel qt6-qttools-devel qt6-qt5compat-devel - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v3 with: submodules: recursive - - name: Install Deps - if: matrix.container == 'fedora:35' - run: dnf install -y gcc-c++ cmake rpm-build gettext openssl-devel openldap-devel pcsc-lite-devel qt5-qtsvg-devel qt5-linguist - - name: Install Deps - if: matrix.container != 'fedora:35' - run: dnf install -y gcc-c++ cmake rpm-build gettext openssl-devel openldap-devel pcsc-lite-devel qt6-qtsvg-devel qt6-qttools-devel qt6-qt5compat-devel - name: Download artifact uses: dawidd6/action-download-artifact@v2 with: @@ -152,7 +150,7 @@ jobs: toolset: 14.29 - vcver: 143 image: windows-2022 - toolset: 14.33 + toolset: 14.34 - vcver: 141 arch: x86 qtver: 5.12.12 diff --git a/CMakeLists.txt b/CMakeLists.txt index 89a787ba7..e17f3196e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10) if(POLICY CMP0074) cmake_policy(SET CMP0074 NEW) endif() -project(qdigidoc4 VERSION 4.2.13) +project(qdigidoc4 VERSION 4.2.14) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/client/Diagnostics.cpp b/client/Diagnostics.cpp index e737940ec..bd7d3771f 100644 --- a/client/Diagnostics.cpp +++ b/client/Diagnostics.cpp @@ -133,6 +133,7 @@ void Diagnostics::generalInfo(QTextStream &s) const constexpr auto APDU = &QByteArray::fromHex; auto printAID = [&](const QString &label, const QByteArray &apdu) { + constexpr auto APDU = &QByteArray::fromHex; QPCSCReader::Result r = reader.transfer(apdu); s << label << ": " << r.SW.toHex(); if (r.SW == APDU("9000")) s << " (OK)";