Skip to content

Commit

Permalink
Merge libpcsc-cpp and libpcsc-mock repositories
Browse files Browse the repository at this point in the history
WE2-828

Signed-off-by: Raul Metsma <raul@metsma.ee>
  • Loading branch information
metsma authored and mrts committed Feb 8, 2024
1 parent d23066a commit 65300d9
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cmake-linux-codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/cmake-linux-coverity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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

Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/cmake-linux-fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
5 changes: 3 additions & 2 deletions .github/workflows/cmake-linux-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ env:
DEBIAN_FRONTEND: noninteractive
DEBFULLNAME: GitHub build
DEBEMAIL: github-action@github
CMAKE_BUILD_PARALLEL_LEVEL: 3

jobs:
build:
Expand All @@ -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

Expand All @@ -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
10 changes: 5 additions & 5 deletions .github/workflows/cmake-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -23,7 +23,7 @@ jobs:
submodules: recursive

- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
id: cache
with:
path: |
Expand Down Expand Up @@ -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
Expand All @@ -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: |
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/cmake-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ on: [push, pull_request]
env:
BUILD_TYPE: RelWithDebInfo
BUILD_NUMBER: ${{github.run_number}}
CMAKE_BUILD_PARALLEL_LEVEL: 3

jobs:
build:
runs-on: windows-2019

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

Expand All @@ -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
Expand All @@ -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: |
Expand All @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion lib/libelectronic-id
Submodule libelectronic-id updated 33 files
+4 −12 .github/workflows/cmake-linux-ubuntu.yml
+5 −15 .github/workflows/cmake-macos.yml
+6 −15 .github/workflows/cmake-windows.yml
+1 −3 .github/workflows/codeql.yml
+0 −3 .gitmodules
+0 −1 lib/libpcsc-cpp
+96 −0 lib/libpcsc-cpp/CMakeLists.txt
+21 −0 lib/libpcsc-cpp/LICENSE
+48 −0 lib/libpcsc-cpp/README.md
+8 −0 lib/libpcsc-cpp/docs/DEVELOPMENT.md
+175 −0 lib/libpcsc-cpp/include/flag-set-cpp/flag_set.hpp
+1,438 −0 lib/libpcsc-cpp/include/magic_enum/magic_enum.hpp
+140 −0 lib/libpcsc-cpp/include/pcsc-cpp/comp_winscard.hpp
+66 −0 lib/libpcsc-cpp/include/pcsc-cpp/pcsc-cpp-utils.hpp
+381 −0 lib/libpcsc-cpp/include/pcsc-cpp/pcsc-cpp.hpp
+8 −0 lib/libpcsc-cpp/scripts/clang-format.sh
+66 −0 lib/libpcsc-cpp/src/Context.hpp
+54 −0 lib/libpcsc-cpp/src/Reader.cpp
+96 −0 lib/libpcsc-cpp/src/SCardCall.hpp
+303 −0 lib/libpcsc-cpp/src/SmartCard.cpp
+159 −0 lib/libpcsc-cpp/src/listReaders.cpp
+176 −0 lib/libpcsc-cpp/src/utils.cpp
+44 −0 lib/libpcsc-cpp/tests/integration/test-pcsc-cpp.cpp
+64 −0 lib/libpcsc-cpp/tests/lib/libpcsc-mock/CMakeLists.txt
+21 −0 lib/libpcsc-cpp/tests/lib/libpcsc-mock/LICENSE
+74 −0 lib/libpcsc-cpp/tests/lib/libpcsc-mock/README.md
+ lib/libpcsc-cpp/tests/lib/libpcsc-mock/docs/libpcsc-mock.png
+131 −0 lib/libpcsc-cpp/tests/lib/libpcsc-mock/include/pcsc-mock/pcsc-mock.hpp
+8 −0 lib/libpcsc-cpp/tests/lib/libpcsc-mock/scripts/clang-format.sh
+315 −0 lib/libpcsc-cpp/tests/lib/libpcsc-mock/src/pcsc-mock.cpp
+104 −0 lib/libpcsc-cpp/tests/lib/libpcsc-mock/tests/pcsc-mock-test.cpp
+64 −0 lib/libpcsc-cpp/tests/mock/test-connect-to-card-transmit-apdus.cpp
+65 −0 lib/libpcsc-cpp/tests/mock/test-select-card-reader-and-card.cpp
2 changes: 1 addition & 1 deletion src/mac/js
Submodule js updated 52 files
+5 −5 .github/workflows/build.yml
+1 −1 LICENSE
+1 −1 README.md
+1 −1 lib/web-eid.js
+1,742 −5,734 package-lock.json
+3 −3 package.json
+43 −90 rollup.config.js
+19 −1 scripts/build-utils.mjs
+27 −18 scripts/build.mjs
+34 −0 src/background-firefox/consent.ts
+1 −1 src/background-safari/services/NativeAppService.ts
+1 −1 src/background/actions/TokenSigning/errorToResponse.ts
+1 −1 src/background/actions/TokenSigning/getCertificate.ts
+1 −1 src/background/actions/TokenSigning/index.ts
+1 −1 src/background/actions/TokenSigning/sign.ts
+1 −1 src/background/actions/TokenSigning/status.ts
+3 −1 src/background/actions/TokenSigning/threeLetterLanguageCodes.ts
+1 −1 src/background/actions/authenticate.ts
+1 −1 src/background/actions/getSigningCertificate.ts
+1 −1 src/background/actions/sign.ts
+1 −1 src/background/actions/status.ts
+1 −13 src/background/background.ts
+4 −1 src/background/services/NativeAppService.ts
+1 −1 src/config.ts
+1 −1 src/content/TokenSigning/injectPageScript.ts
+1 −1 src/content/content.ts
+1 −1 src/models/Browser.ts
+1 −1 src/models/Browser/Permissions.ts
+1 −1 src/models/Browser/Runtime.ts
+1 −1 src/models/Browser/Tabs.ts
+1 −1 src/models/StatusOptions.ts
+1 −1 src/models/TokenSigning/TokenSigningMessage.ts
+1 −1 src/models/TokenSigning/TokenSigningPromise.ts
+1 −1 src/models/TokenSigning/TokenSigningResponse.ts
+1 −1 src/models/TokenSigning/TokenSigningType.ts
+1 −1 src/resources/token-signing-page-script.ts
+1 −1 src/shared/ByteArray.ts
+1 −1 src/shared/Mutex.ts
+1 −1 src/shared/TokenSigningPageScript.ts
+1 −1 src/shared/actionErrorHandler.ts
+1 −1 src/shared/tokenSigningResponse.ts
+1 −1 src/shared/utils/__tests__/version-test.ts
+1 −1 src/shared/utils/calculateJsonSize.ts
+1 −1 src/shared/utils/checkCompatibility.ts
+1 −1 src/shared/utils/semver.ts
+1 −1 src/shared/utils/sender.ts
+1 −1 src/shared/utils/timing.ts
+28 −0 static/_locales/cs/messages.json
+28 −0 static/_locales/sk/messages.json
+1 −2 static/safari/manifest.json
+1 −2 static/safari/manifest_v3.json
+1 −1 static/views/installed.js

0 comments on commit 65300d9

Please sign in to comment.