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.

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

Rewrite using new Aperture and n-api #34

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
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
35 changes: 32 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,50 @@
name: CI
on:
- push
- pull_request
# - pull_request
jobs:
test:
name: Node.js ${{ matrix.node-version }}
runs-on: macos-14
runs-on: macos-15
strategy:
fail-fast: false
matrix:
node-version:
- 20
- 18
# - 18
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm run build
- run: npm test
- name: Upload build
uses: actions/upload-artifact@v3
with:
name: binding-artifact-${{ matrix.node-version }}
path: build

test-intel:
needs: [test]
name: Node.js ${{ matrix.node-version }} (Intel)
runs-on: macos-13
strategy:
fail-fast: false
matrix:
node-version:
- 20
# - 18
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- name: Download build
uses: actions/download-artifact@v3
with:
name: binding-artifact-${{ matrix.node-version }}
path: build
- run: npm test
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ yarn.lock
xcuserdata
/Packages
/*.xcodeproj
/aperture
/build

recording.mp4


# SwiftLint Remote Config Cache
.swiftlint/RemoteConfigCache
6 changes: 6 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parent_config: https://raw.githubusercontent.com/sindresorhus/swiftlint-config/main/.swiftlint.yml
deployment_target:
macOS_deployment_target: '13'
excluded:
- .build
- node_modules
12 changes: 6 additions & 6 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/wulkano/Aperture",
"state" : {
"revision" : "ddfb0fc1b3c789339dd5fd9296ba8076d292611c",
"version" : "2.0.1"
"revision" : "7591bb540c844fe6c47edeac34b17c25e92a717f",
"version" : "3.0.0"
}
},
{
"identity" : "swift-argument-parser",
"identity" : "swift-syntax",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-argument-parser",
"location" : "https://github.com/apple/swift-syntax.git",
"state" : {
"revision" : "46989693916f56d1186bd59ac15124caef896560",
"version" : "1.3.1"
"revision" : "0687f71944021d616d34d922343dcef086855920",
"version" : "600.0.1"
}
}
],
Expand Down
22 changes: 11 additions & 11 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@
import PackageDescription

let package = Package(
name: "ApertureCLI",
name: "aperture",
platforms: [
.macOS(.v10_13)
.macOS(.v13)
],
products: [
.executable(
.library(
name: "aperture",
targets: [
"ApertureCLI"
]
type: .dynamic,
targets: ["ApertureNode"]
)
],
dependencies: [
.package(url: "https://github.com/wulkano/Aperture", from: "2.0.1"),
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.3.1")
.package(url: "https://github.com/wulkano/Aperture", from: "3.0.0"),
.package(path: "node_modules/node-swift")
],
targets: [
.executableTarget(
name: "ApertureCLI",
.target(
name: "ApertureNode",
dependencies: [
"Aperture",
.product(name: "ArgumentParser", package: "swift-argument-parser")
.product(name: "NodeAPI", package: "node-swift"),
.product(name: "NodeModuleSupport", package: "node-swift")
]
)
]
Expand Down
172 changes: 0 additions & 172 deletions Sources/ApertureCLI/ApertureCLI.swift

This file was deleted.

Loading
Loading