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

Resurrect #23

Merged
merged 5 commits into from
Nov 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 40 additions & 0 deletions .github/workflows/Tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: tests

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
linux:
runs-on: ubuntu-24.04
name: Ubuntu 24.04
steps:
- name: Install Swift
uses: tayloraswift/swift-install-action@master
with:
swift-prefix: "swift-6.0.2-release/ubuntu2404/swift-6.0.2-RELEASE"
swift-id: "swift-6.0.2-RELEASE-ubuntu24.04"

- name: Checkout repository
uses: actions/checkout@v3

- name: Install imagemagick
run: sudo apt install -y imagemagick

- name: Run tests
run: Scripts/TestAll

macos:
runs-on: macos-15
name: macOS
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Install imagemagick
run: brew install imagemagick

- name: Run tests
run: Scripts/TestAll
28 changes: 0 additions & 28 deletions .github/workflows/ci.yml

This file was deleted.

24 changes: 0 additions & 24 deletions .github/workflows/docs.yml

This file was deleted.

14 changes: 14 additions & 0 deletions .github/workflows/iOS.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: iOS

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:
uses: tayloraswift/swift-device-action/.github/workflows/build.yml@master
with:
xcode-scheme: 'JPEG'
destination: ${{ github.workflow }}
14 changes: 14 additions & 0 deletions .github/workflows/tvOS.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: tvOS

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:
uses: tayloraswift/swift-device-action/.github/workflows/build.yml@master
with:
xcode-scheme: 'JPEG'
destination: ${{ github.workflow }}
14 changes: 14 additions & 0 deletions .github/workflows/visionOS.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: visionOS

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:
uses: tayloraswift/swift-device-action/.github/workflows/build.yml@master
with:
xcode-scheme: 'JPEG'
destination: ${{ github.workflow }}
14 changes: 14 additions & 0 deletions .github/workflows/watchOS.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: watchOS

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:
uses: tayloraswift/swift-device-action/.github/workflows/build.yml@master
with:
xcode-scheme: 'JPEG'
destination: ${{ github.workflow }}
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
.DS_Store
/.build
.vscode
.build/
.build.ssgc/
.ssgc/

/Packages
/*.xcodeproj
/tests/fuzz/data
/tests/integration/decode/*.png
/tests/integration/decode/*.rgb
/tests/integration/encode/*.jpg
/documentation
/.entrapta
1 change: 0 additions & 1 deletion .swift-version

This file was deleted.

156 changes: 88 additions & 68 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,62 +2,75 @@
import PackageDescription

let package = Package(
name: "jpeg",
products:
name: "swift-jpeg",
products:
[
.library( name: "JPEG", targets: ["JPEG"]),
.executable(name: "fuzzer", targets: ["JPEGFuzzer"]),
.executable(name: "comparator", targets: ["JPEGComparator"]),
.executable(name: "unit-test", targets: ["JPEGUnitTests"]),
.executable(name: "regression-test", targets: ["JPEGRegressionTests"]),
.executable(name: "integration-test", targets: ["JPEGIntegrationTests"]),
.executable(name: "decode-basic", targets: ["JPEGDecodeBasic"]),
.executable(name: "encode-basic", targets: ["JPEGEncodeBasic"]),
.executable(name: "decode-advanced", targets: ["JPEGDecodeAdvanced"]),
.executable(name: "encode-advanced", targets: ["JPEGEncodeAdvanced"]),
.executable(name: "in-memory", targets: ["JPEGInMemory"]),
.executable(name: "decode-online", targets: ["JPEGDecodeOnline"]),
.executable(name: "recompress", targets: ["JPEGRecompress"]),
.executable(name: "rotate", targets: ["JPEGRotate"]),
.executable(name: "custom-color", targets: ["JPEGCustomColor"]),
.library(name: "JPEG", targets: ["JPEG"]),
.executable(name: "fuzzer", targets: ["JPEGFuzzer"]),
.executable(name: "comparator", targets: ["JPEGComparator"]),
.executable(name: "unit-test", targets: ["JPEGUnitTests"]),
.executable(name: "regression-test", targets: ["JPEGRegressionTests"]),
.executable(name: "integration-test", targets: ["JPEGIntegrationTests"]),

.executable(name: "decode-basic", targets: ["JPEGDecodeBasic"]),
.executable(name: "encode-basic", targets: ["JPEGEncodeBasic"]),
.executable(name: "decode-advanced", targets: ["JPEGDecodeAdvanced"]),
.executable(name: "encode-advanced", targets: ["JPEGEncodeAdvanced"]),
.executable(name: "in-memory", targets: ["JPEGInMemory"]),
.executable(name: "decode-online", targets: ["JPEGDecodeOnline"]),
.executable(name: "recompress", targets: ["JPEGRecompress"]),
.executable(name: "rotate", targets: ["JPEGRotate"]),
.executable(name: "custom-color", targets: ["JPEGCustomColor"]),
],
targets:
targets:
[
.target( name: "JPEG", path: "sources/jpeg"),
.executableTarget(name: "JPEGFuzzer", dependencies: ["JPEG"], path: "tests/fuzz",
exclude:
[
.target(name: "JPEG"),
.target(name: "JPEGInspection"),

.executableTarget(name: "JPEGFuzzer",
dependencies: ["JPEG", "JPEGInspection"],
path: "tests/fuzz",
exclude: [
"data/",
]
),
.executableTarget(name: "JPEGComparator", dependencies: ["JPEG"], path: "tests/compare"),
.executableTarget(name: "JPEGUnitTests", dependencies: ["JPEG"], path: "tests/unit"),
.executableTarget(name: "JPEGRegressionTests", dependencies: ["JPEG"], path: "tests/regression",
exclude:
[

.executableTarget(name: "JPEGComparator",
dependencies: ["JPEG", "JPEGInspection"],
path: "tests/compare"),

.executableTarget(name: "JPEGUnitTests",
dependencies: ["JPEG", "JPEGInspection"],
path: "tests/unit"),

.executableTarget(name: "JPEGRegressionTests",
dependencies: ["JPEG", "JPEGInspection"],
path: "tests/regression",
exclude: [
"gold/",
]
),
.executableTarget(name: "JPEGIntegrationTests", dependencies: ["JPEG"], path: "tests/integration",
exclude:
[
]),

.executableTarget(name: "JPEGIntegrationTests",
dependencies: ["JPEG", "JPEGInspection"],
path: "tests/integration",
exclude: [
"decode/",
"encode/",
]
),

.executableTarget(name: "JPEGDecodeBasic", dependencies: ["JPEG"], path: "examples/decode-basic",
exclude:
[
]),

.executableTarget(name: "JPEGDecodeBasic",
dependencies: ["JPEG", "JPEGInspection"],
path: "examples/decode-basic",
exclude: [
"karlie-kwk-2019.jpg.rgb",
"karlie-kwk-2019.jpg",
"karlie-kwk-2019.jpg.rgb.png",
]
),
.executableTarget(name: "JPEGEncodeBasic", dependencies: ["JPEG"], path: "examples/encode-basic",
exclude:
[
]),

.executableTarget(name: "JPEGEncodeBasic",
dependencies: ["JPEG", "JPEGInspection"],
path: "examples/encode-basic",
exclude: [
"karlie-milan-sp12-2011-4-4-0-4.0.jpg",
"karlie-milan-sp12-2011-4-2-2-1.0.jpg",
"karlie-milan-sp12-2011-4-4-0-2.0.jpg",
Expand Down Expand Up @@ -92,9 +105,11 @@ let package = Package(
"karlie-milan-sp12-2011-4-4-0-0.25.jpg",
"karlie-milan-sp12-2011-4-2-0-0.0.jpg",
"karlie-milan-sp12-2011-4-4-4-0.125.jpg",
]
),
.executableTarget(name: "JPEGDecodeAdvanced", dependencies: ["JPEG"], path: "examples/decode-advanced",
]),

.executableTarget(name: "JPEGDecodeAdvanced",
dependencies: ["JPEG", "JPEGInspection"],
path: "examples/decode-advanced",
exclude:
[
"karlie-2019.jpg-0.640x432.gray",
Expand All @@ -106,26 +121,29 @@ let package = Package(
"karlie-2019.jpg-2.320x216.gray",
"karlie-2019.jpg.rgb",
"karlie-2019.jpg-0.640x432.gray.png",
]
),
.executableTarget(name: "JPEGEncodeAdvanced", dependencies: ["JPEG"], path: "examples/encode-advanced",
]),
.executableTarget(name: "JPEGEncodeAdvanced",
dependencies: ["JPEG", "JPEGInspection"],
path: "examples/encode-advanced",
exclude:
[
"karlie-cfdas-2011.png.rgb",
"karlie-cfdas-2011.png",
"karlie-cfdas-2011.png.rgb.jpg",
]
),
.executableTarget(name: "JPEGInMemory", dependencies: ["JPEG"], path: "examples/in-memory",
]),
.executableTarget(name: "JPEGInMemory",
dependencies: ["JPEG", "JPEGInspection"],
path: "examples/in-memory",
exclude:
[
"karlie-2011.jpg.rgb.png",
"karlie-2011.jpg",
"karlie-2011.jpg.rgb",
"karlie-2011.jpg.jpg",
]
),
.executableTarget(name: "JPEGDecodeOnline", dependencies: ["JPEG"], path: "examples/decode-online",
]),
.executableTarget(name: "JPEGDecodeOnline",
dependencies: ["JPEG", "JPEGInspection"],
path: "examples/decode-online",
exclude:
[
"karlie-oscars-2017.jpg-9.rgb.png",
Expand Down Expand Up @@ -169,35 +187,37 @@ let package = Package(
"karlie-oscars-2017.jpg-difference-9.rgb",
"karlie-oscars-2017.jpg-difference-3.rgb",
"karlie-oscars-2017.jpg-difference-1.rgb",
]
),
.executableTarget(name: "JPEGRecompress", dependencies: ["JPEG"], path: "examples/recompress",
]),
.executableTarget(name: "JPEGRecompress",
dependencies: ["JPEG", "JPEGInspection"],
path: "examples/recompress",
exclude:
[
"recompressed-requantized.jpg",
"original.jpg",
"recompressed-full-cycle.jpg",
]
),
.executableTarget(name: "JPEGRotate", dependencies: ["JPEG"], path: "examples/rotate",
]),
.executableTarget(name: "JPEGRotate",
dependencies: ["JPEG", "JPEGInspection"],
path: "examples/rotate",
exclude:
[
"karlie-kwk-wwdc-2017.jpg",
"karlie-kwk-wwdc-2017-iii.jpg",
"karlie-kwk-wwdc-2017-ii.jpg",
"karlie-kwk-wwdc-2017-iv.jpg",
]
),
.executableTarget(name: "JPEGCustomColor", dependencies: ["JPEG"], path: "examples/custom-color",
]),
.executableTarget(name: "JPEGCustomColor",
dependencies: ["JPEG", "JPEGInspection"],
path: "examples/custom-color",
exclude:
[
"output.jpg",
"output.jpg.rgb-16.png",
"output.jpg.rgb-difference.png",
"output.jpg.rgb-8.png",
"output.jpg.rgb",
]
),
],
]),
],
swiftLanguageVersions: [.v4_2, .v5]
)
Loading
Loading