Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update some drivers for OSX universal builds #134

Merged
merged 6 commits into from
Dec 13, 2023
Merged

Update some drivers for OSX universal builds #134

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f915386
Update acquire-driver-common, acquire-driver-hdcam, and acquire-drive…
aliddell Dec 12, 2023
ed10d17
Don't build on pull_request.
aliddell Dec 12, 2023
a5f20f4
Bump patch release.
aliddell Dec 12, 2023
ffec1a5
set CMAKE_OSX_ARCHITECTURES for OSX universal build.
aliddell Dec 12, 2023
913effd
Build on pull request again.
aliddell Dec 12, 2023
abc6b1e
Don't build on `pull_request`.
aliddell Dec 13, 2023
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
3 changes: 3 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ on:
push:
branches:
- main
pull_request: # TODO (aliddell): remove me
branches:
- main

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "acquire-imaging"
authors = ["Nathan Clack <nclack@chanzuckerberg.com>"]
version = "0.2.1"
version = "0.2.2"
edition = "2021"

[lib]
Expand Down
1 change: 1 addition & 0 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ fn main() {
.define("NO_UNIT_TESTS", "TRUE")
.define("NO_EXAMPLES", "TRUE")
.define("CMAKE_OSX_DEPLOYMENT_TARGET", "10.15")
.define("CMAKE_OSX_ARCHITECTURES", "x86_64;arm64")
.build();

let drivers_json =
Expand Down
6 changes: 3 additions & 3 deletions drivers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"acquire-driver-common": "0.1.5",
"acquire-driver-common": "0.1.6",
"acquire-driver-zarr": "0.1.7",
"acquire-driver-egrabber": "0.1.4",
"acquire-driver-hdcam": "0.1.6",
"acquire-driver-egrabber": "0.1.5",
"acquire-driver-hdcam": "0.1.7",
"acquire-driver-spinnaker": "0.1.1"
}
Loading