diff --git a/.github/workflows/cmake-linux-codeql.yml b/.github/workflows/cmake-linux-codeql.yml index 9ad0e645..72b3ec8f 100644 --- a/.github/workflows/cmake-linux-codeql.yml +++ b/.github/workflows/cmake-linux-codeql.yml @@ -16,7 +16,7 @@ jobs: - name: Install dependencies run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake libpcsclite-dev libgtest-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive diff --git a/.github/workflows/cmake-linux-coverity.yml b/.github/workflows/cmake-linux-coverity.yml index 3c72bb95..e4a2ddfb 100644 --- a/.github/workflows/cmake-linux-coverity.yml +++ b/.github/workflows/cmake-linux-coverity.yml @@ -11,6 +11,7 @@ env: BUILD_TYPE: RelWithDebInfo TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }} PROJECTNAME: web-eid/web-eid-app + CMAKE_BUILD_PARALLEL_LEVEL: 3 jobs: coverity: @@ -22,7 +23,7 @@ jobs: - name: Install dependencies run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake libpcsclite-dev libgtest-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive diff --git a/.github/workflows/cmake-linux-fedora.yml b/.github/workflows/cmake-linux-fedora.yml index 911a4d5c..1ac7374d 100644 --- a/.github/workflows/cmake-linux-fedora.yml +++ b/.github/workflows/cmake-linux-fedora.yml @@ -6,17 +6,18 @@ env: BUILD_TYPE: RelWithDebInfo BUILD_NUMBER: ${{github.run_number}} QT_QPA_PLATFORM: offscreen + CMAKE_BUILD_PARALLEL_LEVEL: 3 jobs: build: runs-on: ubuntu-latest - container: 'fedora:36' + container: 'fedora:39' steps: - name: Install Deps - run: dnf install -y git gcc-c++ cmake rpm-build openssl-devel pcsc-lite-devel qt5-qtsvg-devel qt5-linguist gtest-devel + run: dnf install -y git gcc-c++ cmake rpm-build openssl-devel pcsc-lite-devel qt6-qtsvg-devel qt6-qttools-devel gtest-devel - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive @@ -26,7 +27,7 @@ jobs: - name: Build run: cmake --build build --config $BUILD_TYPE --target package - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: web-eid-app-fedora-build-${{github.run_number}} path: build/*rpm diff --git a/.github/workflows/cmake-linux-ubuntu.yml b/.github/workflows/cmake-linux-ubuntu.yml index 4b305de0..294cb043 100644 --- a/.github/workflows/cmake-linux-ubuntu.yml +++ b/.github/workflows/cmake-linux-ubuntu.yml @@ -9,6 +9,7 @@ env: DEBIAN_FRONTEND: noninteractive DEBFULLNAME: GitHub build DEBEMAIL: github-action@github + CMAKE_BUILD_PARALLEL_LEVEL: 3 jobs: build: @@ -32,7 +33,7 @@ jobs: if: matrix.container != 'ubuntu:20.04' run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts debhelper pkg-config cmake libpcsclite-dev libssl-dev libgtest-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libqt6core5compat6-dev - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive @@ -45,7 +46,7 @@ jobs: # Debian creates artifacts outside of project dir, copy them back to make them available in the build artifacts cp -r ../web-eid*.* build/src/app - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: web-eid-app-ubuntu-build-${{matrix.name}}-${{github.run_number}} path: build/src/app/*.*deb diff --git a/.github/workflows/cmake-macos.yml b/.github/workflows/cmake-macos.yml index b2018b8d..fc438a51 100644 --- a/.github/workflows/cmake-macos.yml +++ b/.github/workflows/cmake-macos.yml @@ -9,8 +9,8 @@ env: OPENSSL_ROOT_DIR: ${{ github.workspace }}/openssl-binary GTest_ROOT: ${{ github.workspace }}/gtest-binary QT_QPA_PLATFORM: offscreen - MAKEFLAGS: -j3 - MACOSX_DEPLOYMENT_TARGET: 10.16 + CMAKE_BUILD_PARALLEL_LEVEL: 3 + MACOSX_DEPLOYMENT_TARGET: 11.0 jobs: build: @@ -23,7 +23,7 @@ jobs: submodules: recursive - name: Cache - uses: actions/cache@v3 + uses: actions/cache@v4 id: cache with: path: | @@ -60,7 +60,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v3 with: - version: 6.5.3 + version: 6.6.1 arch: clang_64 - name: Configure @@ -76,7 +76,7 @@ jobs: # run: ctest -V -C ${BUILD_TYPE} --test-dir ${BUILD_DIR} - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: web-eid-app-macos-build-${{github.run_number}} path: | diff --git a/.github/workflows/cmake-windows.yml b/.github/workflows/cmake-windows.yml index 18e6251a..3096f77f 100644 --- a/.github/workflows/cmake-windows.yml +++ b/.github/workflows/cmake-windows.yml @@ -5,6 +5,7 @@ on: [push, pull_request] env: BUILD_TYPE: RelWithDebInfo BUILD_NUMBER: ${{github.run_number}} + CMAKE_BUILD_PARALLEL_LEVEL: 3 jobs: build: @@ -12,7 +13,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive @@ -21,12 +22,12 @@ jobs: with: vcpkgArguments: gtest openssl vcpkgTriplet: x64-windows - vcpkgGitCommitId: 9b9c2758ece1d8ac0de90589730bb5ccf45c0874 + vcpkgGitCommitId: 1f619be01b436b796dab797dd1e1721c5676f8ac - name: Install Qt uses: jurplel/install-qt-action@v3 with: - version: 6.5.2 + version: 6.6.1 arch: win64_msvc2019_64 - name: Setup MS Visual C++ dev env @@ -36,9 +37,9 @@ jobs: - name: Configure run: | - cmake "-GNinja" ` + cmake "-GNinja" -S . -B build ` "-DCMAKE_TOOLCHAIN_FILE=${env:VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" ` - "-DCMAKE_BUILD_TYPE=${env:BUILD_TYPE}" -S . -B build + "-DCMAKE_BUILD_TYPE=${env:BUILD_TYPE}" - name: Build run: | @@ -50,7 +51,7 @@ jobs: run: ctest -V -C ${env:BUILD_TYPE} --test-dir build - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: web-eid-app-windows-build-${{github.run_number}} path: | diff --git a/lib/libelectronic-id b/lib/libelectronic-id index 28a157e6..4d935f1e 160000 --- a/lib/libelectronic-id +++ b/lib/libelectronic-id @@ -1 +1 @@ -Subproject commit 28a157e62812e168c7d452ebe30d82d196aca579 +Subproject commit 4d935f1ea6bacf2f3a13c3d8eb759be39ca2e4c0 diff --git a/src/mac/js b/src/mac/js index 351a0cb4..c612cd74 160000 --- a/src/mac/js +++ b/src/mac/js @@ -1 +1 @@ -Subproject commit 351a0cb491bd8ef9506ac85a6fe4742fb45b3fb1 +Subproject commit c612cd7473f4e535191f4b9912c6c024704b5189