Skip to content

Commit

Permalink
I THINK ITS GETTING GOOD
Browse files Browse the repository at this point in the history
  • Loading branch information
dvub committed Dec 19, 2024
1 parent 464134e commit ae4b9df
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 4 deletions.
15 changes: 13 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
include:
- { name: Ubuntu (latest), os: ubuntu-latest, cross-target: "" }
- { name: Ubuntu (latest), os: ubuntu-latest, cross-target: "" }
# - {
# name: macos-universal,
# os: macos-latest,
Expand Down Expand Up @@ -78,7 +78,18 @@ jobs:
- name: Package all targets from bundler.toml
# Instead of hardcoding which targets to build and package, we'll
# package everything that's got en entry in the `bundler.toml` file
run: cargo xtask bundle midiometry --release
run: |
runner_name=${{ matrix.name }}
if [[ $runner_name = 'macos-universal' ]]; then
export MACOSX_DEPLOYMENT_TARGET=10.13
cargo xtask bundle-universal midiometry --release
else
cross_target=${{ matrix.cross-target }}
if [[ -n $cross_target ]]; then
package_args+=("--target" "$cross_target")
fi
cargo xtask bundle midiometry --release
fi
- name: Determine build archive name
run: |
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/target
/assets
2 changes: 1 addition & 1 deletion gui/next.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { NextConfig } from "next";
const nextConfig: NextConfig = {
/* config options here */
output: 'export',
distDir: '../target/bundled/dist/'
distDir: '../assets'
};

export default nextConfig;
2 changes: 1 addition & 1 deletion src/editor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ pub fn create_editor(buffer: Consumer<NoteEvent<()>>) -> WebViewEditor {
&path[1..]
};

let dir = include_dir!("$CARGO_MANIFEST_DIR/target/bundled/dist");
let dir = include_dir!("$CARGO_MANIFEST_DIR/assets/");

// mime guess is awesome!
let mime_type =
Expand Down

0 comments on commit ae4b9df

Please sign in to comment.