Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bbf8741f21 | ||
|
|
ea9cd868a5 | ||
|
|
2b3a2772d2 |
7 changed files with 22 additions and 41 deletions
|
|
@ -1,7 +1,4 @@
|
||||||
|
scripts
|
||||||
|
.github
|
||||||
.editorconfig
|
.editorconfig
|
||||||
.gitignore
|
.pre-commit-hooks.yaml
|
||||||
/.git/
|
|
||||||
/.github/
|
|
||||||
/.pre-commit-hooks.yaml
|
|
||||||
/scripts/
|
|
||||||
/target/
|
|
||||||
|
|
|
||||||
17
.github/workflows/deploy.yml
vendored
17
.github/workflows/deploy.yml
vendored
|
|
@ -3,12 +3,7 @@ name: deploy
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
tags:
|
tags:
|
||||||
- v*.*.*
|
- "v*.*.*"
|
||||||
|
|
||||||
concurrency:
|
|
||||||
# If we ever end up with two concurrent jobs for releasing the same tag, the former should be cancelled
|
|
||||||
group: release-${{ github.ref }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
actions: read
|
actions: read
|
||||||
|
|
@ -59,15 +54,15 @@ jobs:
|
||||||
|
|
||||||
- name: Get the Oxipng version
|
- name: Get the Oxipng version
|
||||||
id: oxipngMeta
|
id: oxipngMeta
|
||||||
run: >
|
run:
|
||||||
echo "version=$(cargo metadata --format-version 1 --no-deps |
|
echo "version=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[] | select(.name == "oxipng").version')"
|
||||||
jq -r '.packages[] | select(.name == "oxipng").version')" >> "$GITHUB_OUTPUT"
|
>> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
- name: Retrieve ${{ matrix.target }} binary
|
- name: Retrieve ${{ matrix.target }} binary
|
||||||
uses: dawidd6/action-download-artifact@v21
|
uses: dawidd6/action-download-artifact@v20
|
||||||
with:
|
with:
|
||||||
workflow: oxipng.yml
|
workflow: oxipng.yml
|
||||||
commit: ${{ github.sha }}
|
commit: ${{ env.GITHUB_SHA }}
|
||||||
name: Oxipng binary (${{ matrix.target }})
|
name: Oxipng binary (${{ matrix.target }})
|
||||||
path: target
|
path: target
|
||||||
|
|
||||||
|
|
|
||||||
10
.github/workflows/docker.yml
vendored
10
.github/workflows/docker.yml
vendored
|
|
@ -2,9 +2,9 @@ name: docker
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- 'master'
|
||||||
tags:
|
tags:
|
||||||
- v*.*.*
|
- 'v*.*.*'
|
||||||
pull_request:
|
pull_request:
|
||||||
types:
|
types:
|
||||||
- opened
|
- opened
|
||||||
|
|
@ -17,12 +17,6 @@ on:
|
||||||
type: boolean
|
type: boolean
|
||||||
default: true
|
default: true
|
||||||
|
|
||||||
concurrency:
|
|
||||||
# If we ever end up with two concurrent Docker build jobs for the same commit
|
|
||||||
# and same versioning context, the former should be cancelled
|
|
||||||
group: docker-${{ github.sha }}-${{ github.ref_type }}-${{ github.head_ref }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
uses: docker/github-builder/.github/workflows/build.yml@v1
|
uses: docker/github-builder/.github/workflows/build.yml@v1
|
||||||
|
|
|
||||||
7
.github/workflows/oxipng.yml
vendored
7
.github/workflows/oxipng.yml
vendored
|
|
@ -8,11 +8,6 @@ on:
|
||||||
- synchronize
|
- synchronize
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
concurrency:
|
|
||||||
# If we ever end up with two concurrent CI jobs for the same commit, the former should be cancelled
|
|
||||||
group: ci-${{ github.sha }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
ci:
|
ci:
|
||||||
name: CI
|
name: CI
|
||||||
|
|
@ -131,7 +126,7 @@ jobs:
|
||||||
- name: Build CLI binary
|
- name: Build CLI binary
|
||||||
run: cargo build --release -Zbuild-std
|
run: cargo build --release -Zbuild-std
|
||||||
env:
|
env:
|
||||||
RUSTFLAGS: "-Zlocation-detail=none -Zunstable-options -Cpanic=immediate-abort"
|
RUSTFLAGS: '-Zlocation-detail=none -Zunstable-options -Cpanic=immediate-abort'
|
||||||
|
|
||||||
- name: Upload CLI binary as artifact
|
- name: Upload CLI binary as artifact
|
||||||
uses: actions/upload-artifact@v7
|
uses: actions/upload-artifact@v7
|
||||||
|
|
|
||||||
8
.gitignore
vendored
8
.gitignore
vendored
|
|
@ -1,6 +1,6 @@
|
||||||
.DS_Store
|
target
|
||||||
*.bk
|
*.bk
|
||||||
|
.DS_Store
|
||||||
*.out.png
|
*.out.png
|
||||||
/.idea/
|
/.idea
|
||||||
/node_modules/
|
/node_modules
|
||||||
/target/
|
|
||||||
|
|
|
||||||
8
Cargo.lock
generated
8
Cargo.lock
generated
|
|
@ -339,9 +339,9 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "log"
|
name = "log"
|
||||||
version = "0.4.30"
|
version = "0.4.29"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "616ec5685824bcc94416c6d4a7a446eea774a31efd7062c8480ba6fd06d7a6e5"
|
checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "memchr"
|
name = "memchr"
|
||||||
|
|
@ -538,9 +538,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_json"
|
name = "serde_json"
|
||||||
version = "1.0.150"
|
version = "1.0.149"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
|
checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"itoa",
|
"itoa",
|
||||||
"memchr",
|
"memchr",
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@ env_logger = { version = "0.11.10", optional = true, default-features = false, f
|
||||||
image = { version = "0.25.9", optional = true, default-features = false, features = ["png"] }
|
image = { version = "0.25.9", optional = true, default-features = false, features = ["png"] }
|
||||||
indexmap = "2.14.0"
|
indexmap = "2.14.0"
|
||||||
libdeflater = "1.25.2"
|
libdeflater = "1.25.2"
|
||||||
log = "0.4.30"
|
log = "0.4.29"
|
||||||
parse-size = { version = "1.1.0", optional = true }
|
parse-size = { version = "1.1.0", optional = true }
|
||||||
rayon = { version = "1.11.0", optional = true }
|
rayon = { version = "1.11.0", optional = true }
|
||||||
rgb = "0.8.53"
|
rgb = "0.8.53"
|
||||||
|
|
@ -55,7 +55,7 @@ zopfli = { version = "0.8.3", optional = true, default-features = false, feature
|
||||||
glob = { version = "0.3.3", optional = true }
|
glob = { version = "0.3.3", optional = true }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
serde_json = "1.0.150"
|
serde_json = "1.0.149"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
binary = ["dep:clap", "dep:glob", "dep:env_logger", "dep:parse-size"]
|
binary = ["dep:clap", "dep:glob", "dep:env_logger", "dep:parse-size"]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue