Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add chromium support #324

Merged
merged 1 commit into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions .github/workflows/cmake-linux-fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,10 @@ env:
jobs:
build:
runs-on: ubuntu-latest
container: ${{ matrix.container }}
container: fedora:${{ matrix.container }}
strategy:
matrix:
container: ['fedora:38', 'fedora:39']
include:
- container: 'fedora:38'
name: fedora38
- container: 'fedora:39'
name: fedora39
container: [38, 39, 40]

steps:
- name: Install Deps
Expand All @@ -30,12 +25,12 @@ jobs:
submodules: recursive

- name: Configure CMake
run: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=/usr -B build -S .
run: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -B build -S .

- name: Build
run: cmake --build build --config $BUILD_TYPE --target package

- uses: actions/upload-artifact@v4
with:
name: web-eid-app-fedora-build-${{matrix.name}}-${{github.run_number}}
name: web-eid-app-fedora-build-fedora${{matrix.container}}-${{github.run_number}}
path: build/*rpm
1 change: 1 addition & 0 deletions debian/not-installed
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
etc/opt/chrome/native-messaging-hosts/eu.webeid.json
Copy link
Member

@mrts mrts Jul 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to self: this will be installed with postinst script: https://github.com/web-eid/web-eid-app/blob/main/debian/web-eid-chrome.postinst

4 changes: 3 additions & 1 deletion debian/web-eid-chrome.install
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
usr/share/web-eid/eu.webeid.json
usr/share/google-chrome/extensions/ncibgoaomkmdpilpocfeponihegamlic.json
usr/share/google-chrome/extensions/ncibgoaomkmdpilpocfeponihegamlic.json
usr/share/chromium/extensions/ncibgoaomkmdpilpocfeponihegamlic.json
etc/chromium/native-messaging-hosts/eu.webeid.json
8 changes: 7 additions & 1 deletion src/app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ else()
endif()
set(WEBEID_PATH ${CMAKE_INSTALL_FULL_BINDIR}/web-eid)
install(TARGETS web-eid DESTINATION ${CMAKE_INSTALL_BINDIR})
if(EXISTS "/etc/debian_version")
if(EXISTS /etc/debian_version)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eu.webeid.firefox.json
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/mozilla/native-messaging-hosts RENAME eu.webeid.json)
else()
Expand All @@ -167,8 +167,14 @@ else()
endif()
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eu.webeid.json
DESTINATION ${CMAKE_INSTALL_DATADIR}/web-eid)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eu.webeid.json
DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/chromium/native-messaging-hosts)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eu.webeid.json
DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/opt/chrome/native-messaging-hosts)
install(FILES ${CMAKE_SOURCE_DIR}/install/ncibgoaomkmdpilpocfeponihegamlic.json
DESTINATION ${CMAKE_INSTALL_DATADIR}/google-chrome/extensions)
install(FILES ${CMAKE_SOURCE_DIR}/install/ncibgoaomkmdpilpocfeponihegamlic.json
DESTINATION ${CMAKE_INSTALL_DATADIR}/chromium/extensions)
install(FILES ${CMAKE_SOURCE_DIR}/install/web-eid.desktop
DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
if (BUNDLE_XPI)
Expand Down
Loading