Skip to content
Draft
17 changes: 15 additions & 2 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ windows-latest, macOS-latest, ubuntu-latest ]
os: [ windows-latest, macOS-latest ]

steps:
- uses: actions/checkout@v2
Expand All @@ -19,9 +19,22 @@ jobs:
- name: Run tests
run: cargo test --verbose

build-ubuntu:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Install xkbcommon
run: sudo apt-get install libxkbcommon-dev
- name: Build
run: cargo build --verbose
- name: Run tests
run: cargo test --verbose

deploy:

needs: build
needs: [ build, build-ubuntu ]
runs-on: macOS-latest

steps:
Expand Down
15 changes: 14 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,24 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ windows-latest, macOS-latest, ubuntu-latest ]
os: [ windows-latest, macOS-latest ]

steps:
- uses: actions/checkout@v2
- name: Build
run: cargo build --verbose
- name: Run tests
run: cargo test --verbose

build-ubuntu:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Install xkbcommon
run: sudo apt-get install libxkbcommon-dev
- name: Build
run: cargo build --verbose
- name: Run tests
run: cargo test --verbose
16 changes: 14 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license-file = "LICENSE"
name = "fpsdk"
readme = "README.md"
repository = "https://github.com/tonikasoft/fpsdk"
version = "1.0.3"
version = "1.1.0"

[package.metadata.docs.rs]
targets = [ "x86_64-apple-darwin", "x86_64-pc-windows-msvc" ]
Expand All @@ -15,18 +15,30 @@ targets = [ "x86_64-apple-darwin", "x86_64-pc-windows-msvc" ]
bitflags = "1.2"
hresult = "0.0.1"
log = "0.4"
raw-window-handle = "0.3"

[target.'cfg(target_os = "macos")'.dependencies]
cocoa = "0.20"

[build-dependencies]
cc = { version = "1.0", features = ["parallel"] }

[dev-dependencies]
bincode = "1.2"
chrono = "0.4"
cocoa = "0.20"
iced_wgpu = { git = "https://github.com/hecrj/iced.git" }
iced_winit = { git = "https://github.com/hecrj/iced.git" }
log = "0.4"
serde = { version = "1.0", features = ["derive"] }
simple-logging = "2.0"
simplelog = "0.7"

[[example]]
name = "simple"
path = "examples/simple.rs"
path = "examples/simple/simple.rs"
crate-type = ["cdylib"]

[[example]]
name = "gui"
path = "examples/simple/main.rs"
2 changes: 1 addition & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ fn main() {
.file("src/cxx/fp_plugclass.cpp")
.file("src/cxx/wrapper.cpp")
.cpp(true)
.flag("-std=c++11")
// .flag("-std=c++11")
.compile("fpsdk");

println!("cargo:rerun-if-changed=src/cxx/fp_plugclass.h");
Expand Down
Loading