Skip to content

Commit

Permalink
Merge branch 'main' into multi-segment-audio
Browse files Browse the repository at this point in the history
  • Loading branch information
Brendonovich committed Dec 17, 2024
2 parents be630a8 + a8ab944 commit 574e746
Show file tree
Hide file tree
Showing 66 changed files with 2,725 additions and 974 deletions.
39 changes: 39 additions & 0 deletions .github/prebuild.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,45 @@ rustflags = [
await exec(`tar xf ${__root}/native-deps.tar.xz -C ${nativeDeps}`);

if (os === "darwin") {
const frameworkDir = path.join(nativeDeps, "Spacedrive.framework");

const headersDir = path.join(frameworkDir, "Headers");
const librariesDir = path.join(frameworkDir, "Libraries");

const libraries = await fs.readdir(librariesDir);

const unnecessaryLibraries = libraries.filter(
(v) =>
!(
v.startsWith("libav") ||
v.startsWith("libsw") ||
v.startsWith("libpostproc")
)
);

for (const lib of unnecessaryLibraries) {
await fs.rm(path.join(librariesDir, lib), { recursive: true });
}

const headers = await fs.readdir(headersDir);

const unnecessaryHeaders = headers.filter(
(v) =>
!(
v.startsWith("libav") ||
v.startsWith("libsw") ||
v.startsWith("libpostproc")
)
);

for (const header of unnecessaryHeaders) {
await fs.rm(path.join(headersDir, header), { recursive: true });
}

await fs.rm(path.join(frameworkDir, "Resources", "Models"), {
recursive: true,
});

await symlinkSharedLibsMacOS(nativeDeps).catch((e) => {
console.error(`Failed to symlink shared libs.`);
throw e;
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,19 @@ jobs:
main();
- name: create draft release
- name: Create draft CN release
uses: crabnebula-dev/cloud-release@v0
with:
command: release draft ${{ env.CN_APPLICATION }} ${{ steps.read_version.outputs.value }} --framework tauri
api-key: ${{ secrets.CN_API_KEY }}

- name: Create draft GH release
# TODO: Change to stable version when available
uses: softprops/action-gh-release@v2
with:
draft: true
generate_release_notes: true

build:
needs: draft
if: ${{ needs.draft.outputs.needs_release == 'true' }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ dist-ssr
.env.development
.env.test
target
.cursorrules

# Editor directories and files
.vscode/*
Expand Down
49 changes: 40 additions & 9 deletions Cargo.lock

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

3 changes: 2 additions & 1 deletion apps/desktop/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "desktop"
version = "0.3.4"
version = "0.3.9"
description = "Beautiful screen recordings, owned by you."
authors = ["you"]
edition = "2021"
Expand Down Expand Up @@ -78,6 +78,7 @@ cap-media = { path = "../../../crates/media" }
cap-flags = { path = "../../../crates/flags" }
cap-recording = { path = "../../../crates/recording" }
cap-export = { path = "../../../crates/export" }
flume.workspace = true

[target.'cfg(target_os = "macos")'.dependencies]
core-graphics = "0.24.0"
Expand Down
Loading

0 comments on commit 574e746

Please sign in to comment.