Skip to content

Commit

Permalink
Another attempt at getting the ci to build
Browse files Browse the repository at this point in the history
  • Loading branch information
sandreae committed Dec 13, 2024
1 parent 7eb8539 commit 43c72e1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ jobs:
- name: Compile GResource
run: |
mkdir -p target/${{ matrix.target }}/release/
glib-compile-resources --sourcedir src --target target/${{ matrix.target }}/release/aardvark.gresource aardvark-app/src/aardvark.gresource.xml
glib-compile-resources --sourcedir aardvark-app/src --target target/${{ matrix.target }}/release/aardvark.gresource aardvark-app/src/aardvark.gresource.xml
- name: Create App Bundle
run: |
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[workspace]

resolver = "2"
members = ["aardvark-app", "aardvark-node"]
4 changes: 2 additions & 2 deletions aardvark-app/src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ run_command(

cargo_bin = find_program('cargo')
cargo_opt = [ '--manifest-path', meson.project_source_root() / 'Cargo.toml' ]
cargo_opt += [ '--target-dir', meson.project_build_root() / 'src' ]
cargo_opt += [ '--target-dir', meson.project_build_root() / 'aardvark-app/src' ]
cargo_env = [ 'CARGO_HOME=' + meson.project_build_root() / 'cargo-home' ]

if get_option('buildtype') == 'release'
Expand All @@ -51,6 +51,6 @@ cargo_build = custom_target(
command: [
'env', cargo_env,
cargo_bin, 'build',
cargo_opt, '&&', 'cp', 'src' / rust_target / meson.project_name(), '@OUTPUT@',
cargo_opt, '&&', 'cp', 'aardvark-app/src' / rust_target / meson.project_name(), '@OUTPUT@',
]
)

0 comments on commit 43c72e1

Please sign in to comment.