Merge pull request 'ci: libdbus-1-dev for keyring build, drop appimage target (#79)' (#84) from issue-79-ci-libdbus into main
This commit is contained in:
commit
b684c88d2b
3 changed files with 14 additions and 3 deletions
|
|
@ -25,7 +25,8 @@ jobs:
|
||||||
apt-get update
|
apt-get update
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
curl wget git ca-certificates build-essential pkg-config \
|
curl wget git ca-certificates build-essential pkg-config \
|
||||||
libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev libssl-dev
|
libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev libssl-dev \
|
||||||
|
libdbus-1-dev
|
||||||
# Node.js is required by actions/checkout and actions/cache (they
|
# Node.js is required by actions/checkout and actions/cache (they
|
||||||
# are JavaScript actions and need `node` in the container PATH).
|
# are JavaScript actions and need `node` in the container PATH).
|
||||||
curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
|
curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
|
||||||
|
|
@ -63,6 +64,16 @@ jobs:
|
||||||
- name: cargo test
|
- name: cargo test
|
||||||
run: cargo test --manifest-path src-tauri/Cargo.toml --all-targets
|
run: cargo test --manifest-path src-tauri/Cargo.toml --all-targets
|
||||||
|
|
||||||
|
# Informational audit of transitive dependencies. Failure does not
|
||||||
|
# block the CI (advisories can appear on unrelated crates and stall
|
||||||
|
# unrelated work); surface them in the job log so we see them on
|
||||||
|
# every PR run and can react in a follow-up.
|
||||||
|
- name: cargo audit
|
||||||
|
continue-on-error: true
|
||||||
|
run: |
|
||||||
|
cargo install --locked cargo-audit || true
|
||||||
|
cargo audit --file src-tauri/Cargo.lock || true
|
||||||
|
|
||||||
frontend:
|
frontend:
|
||||||
runs-on: ubuntu
|
runs-on: ubuntu
|
||||||
container: ubuntu:22.04
|
container: ubuntu:22.04
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ jobs:
|
||||||
|
|
||||||
- name: Install Linux dependencies
|
- name: Install Linux dependencies
|
||||||
run: |
|
run: |
|
||||||
apt-get install -y build-essential libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf jq libssl-dev xdg-utils
|
apt-get install -y build-essential libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf jq libssl-dev xdg-utils libdbus-1-dev
|
||||||
|
|
||||||
- name: Install Windows cross-compile dependencies
|
- name: Install Windows cross-compile dependencies
|
||||||
run: |
|
run: |
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
},
|
},
|
||||||
"bundle": {
|
"bundle": {
|
||||||
"active": true,
|
"active": true,
|
||||||
"targets": ["nsis", "deb", "rpm", "appimage"],
|
"targets": ["nsis", "deb", "rpm"],
|
||||||
"icon": [
|
"icon": [
|
||||||
"icons/32x32.png",
|
"icons/32x32.png",
|
||||||
"icons/128x128.png",
|
"icons/128x128.png",
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue