Skip to content
Draft
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
6 changes: 3 additions & 3 deletions .github/workflows/rust-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ jobs:
save-if: ${{ github.ref == 'refs/heads/dev' }}

- name: Check native app
run: cargo check --locked --manifest-path src-tauri/Cargo.toml
run: cargo check --locked --manifest-path src-tauri/Cargo.toml --features matrix-crypto

- name: Run Rust tests
run: cargo test --locked --manifest-path src-tauri/Cargo.toml
run: cargo test --locked --manifest-path src-tauri/Cargo.toml --features matrix-crypto

- name: Run Clippy
run: cargo clippy --locked --manifest-path src-tauri/Cargo.toml --all-targets -- -D warnings
run: cargo clippy --locked --manifest-path src-tauri/Cargo.toml --all-targets --features matrix-crypto -- -D warnings
6 changes: 3 additions & 3 deletions .github/workflows/tauri-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ jobs:
- name: Build desktop bundles
if: ${{ !matrix.cef }}
shell: bash
run: pnpm tauri build ${{ matrix.args }} $TAURI_BUILD_ARGS
run: pnpm tauri:wry build ${{ matrix.args }} $TAURI_BUILD_ARGS

- name: Package macOS .app for updater
if: ${{ matrix.name == 'macOS' }}
Expand Down Expand Up @@ -379,7 +379,7 @@ jobs:
if [ "$IS_NIGHTLY" = "true" ]; then
export SABLE_BUILD_FLAVOR=dev
fi
pnpm tauri android build --apk --aab --target aarch64 armv7
pnpm tauri android build --apk --aab --target aarch64 armv7 -- --features matrix-crypto
OUT='src-tauri/gen/android/app/build/outputs'
APK=$(find "$OUT/apk/universal/release" -name '*.apk' -type f | head -1)
AAB=$(find "$OUT/bundle/universalRelease" -name '*.aab' -type f | head -1)
Expand Down Expand Up @@ -508,7 +508,7 @@ jobs:
if [ "$IS_NIGHTLY" = "true" ]; then
export SABLE_BUILD_FLAVOR=dev
fi
pnpm tauri ios build --no-sign --ci
pnpm tauri ios build --no-sign --ci -- --features matrix-crypto
IPA=$(find src-tauri/gen/apple/build -name '*.ipa' -type f | head -1)
[ -n "$IPA" ] || { echo "IPA not found"; ls -R src-tauri/gen/apple/build 2>/dev/null || true; exit 1; }
NORMALIZED_IPA="$(dirname "$IPA")/Sable-${VERSION}-ios-arm64.ipa"
Expand Down
7 changes: 1 addition & 6 deletions knip.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,7 @@
"type": true
},
"ignoreFiles": ["src/app/generated/**/*"],
"ignoreDependencies": [
"buffer",
"@sableclient/sable-call-embedded",
"@matrix-org/matrix-sdk-crypto-wasm",
"@sableclient/twemoji-font"
],
"ignoreDependencies": ["buffer", "@sableclient/sable-call-embedded", "@sableclient/twemoji-font"],
"ignoreBinaries": ["knope", "mise"],
"rules": {
"exports": "off",
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"@fontsource/space-mono": "5.2.9",
"@lottiefiles/dotlottie-react": "^0.12.0",
"@lottiefiles/dotlottie-web": "0.40.1",
"@matrix-org/matrix-sdk-crypto-wasm": "^18.3.1",
"@noble/hashes": "^2.2.0",
"@phosphor-icons/react": "^2.1.10",
"@sableclient/twemoji-font": "^1.0.4",
Expand Down
3 changes: 3 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion scripts/tauri.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ async function main() {
logger.info('Building without the auto-updater (--no-updater)');
}

const features = noUpdater ? platform : `${platform},updater`;
const base = noUpdater ? platform : `${platform},updater`;
const features = `${base},matrix-crypto`;
const args = [cmd, '--features', features, ...tauriArgs];
if (!tauriArgs.includes('--')) {
args.push('--');
Expand Down
Loading