Update rust version & MSRV to 1.82
Some checks failed
/ clippy (pull_request) Failing after 2m2s
/ deny (pull_request) Successful in 11s
/ tests (pull_request) Successful in 2m6s
/ check (aarch64-unknown-linux-musl) (pull_request) Successful in 2m13s
/ check (armv7-unknown-linux-musleabihf) (pull_request) Successful in 2m16s
/ check (x86_64-unknown-linux-musl) (pull_request) Successful in 2m10s

This commit is contained in:
asonix 2024-11-12 13:46:30 -06:00
parent bb6ec7c817
commit 47b3fb84b6
7 changed files with 27 additions and 23 deletions

View file

@ -10,7 +10,7 @@ jobs:
clippy:
runs-on: docker
container:
image: docker.io/asonix/actions-base-image:0.1.21
image: docker.io/asonix/actions-base-image:0.1.22
steps:
-
name: Checkout pict-rs
@ -27,7 +27,7 @@ jobs:
deny:
runs-on: docker
container:
image: docker.io/asonix/actions-base-image:0.1.21
image: docker.io/asonix/actions-base-image:0.1.22
steps:
-
name: Checkout pict-rs
@ -43,7 +43,7 @@ jobs:
tests:
runs-on: docker
container:
image: docker.io/asonix/actions-base-image:0.1.21
image: docker.io/asonix/actions-base-image:0.1.22
steps:
-
name: Checkout pict-rs
@ -65,7 +65,7 @@ jobs:
- aarch64-unknown-linux-musl
runs-on: docker
container:
image: docker.io/asonix/actions-base-image:0.1.21
image: docker.io/asonix/actions-base-image:0.1.22
steps:
-
name: Checkout pict-rs

View file

@ -10,7 +10,7 @@ jobs:
clippy:
runs-on: base-image
container:
image: docker.io/asonix/actions-base-image:0.1.21
image: docker.io/asonix/actions-base-image:0.1.22
steps:
-
name: Checkout pict-rs
@ -27,7 +27,7 @@ jobs:
# deny:
# runs-on: docker
# container:
# image: docker.io/asonix/actions-base-image:0.1.21
# image: docker.io/asonix/actions-base-image:0.1.22
# steps:
# -
# name: Checkout pict-rs
@ -43,7 +43,7 @@ jobs:
tests:
runs-on: docker
container:
image: docker.io/asonix/actions-base-image:0.1.21
image: docker.io/asonix/actions-base-image:0.1.22
steps:
-
name: Checkout pict-rs
@ -62,7 +62,7 @@ jobs:
- tests
runs-on: docker
container:
image: docker.io/asonix/actions-base-image:0.1.21
image: docker.io/asonix/actions-base-image:0.1.22
strategy:
fail-fast: false
matrix:
@ -162,7 +162,7 @@ jobs:
publish-docker:
runs-on: docker
container:
image: docker.io/asonix/actions-base-image:0.1.21
image: docker.io/asonix/actions-base-image:0.1.22
needs: [build]
steps:
-
@ -213,7 +213,7 @@ jobs:
needs: [build]
runs-on: docker
container:
image: docker.io/asonix/actions-base-image:0.1.21
image: docker.io/asonix/actions-base-image:0.1.22
steps:
- uses: https://github.com/actions/download-artifact@v3
with:
@ -231,7 +231,7 @@ jobs:
needs: [build]
runs-on: docker
container:
image: docker.io/asonix/actions-base-image:0.1.21
image: docker.io/asonix/actions-base-image:0.1.22
steps:
-
name: Checkout pict-rs

View file

@ -7,6 +7,10 @@ license = "AGPL-3.0"
readme = "README.md"
repository = "https://git.asonix.dog/asonix/pict-rs"
edition = "2021"
rust-version = "1.82"
[lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tokio_unstable)'] }
[profile.release]
strip = true

View file

@ -220,7 +220,7 @@ More information is available in the [Ubuntu and Debian docs](./docs/ubuntu-and-
##### Compile from Source
pict-rs can be compiled from source using a recent version of the rust compiler. I do development
and produce releases on 1.75
and produce releases on 1.82
Like the Binary Download option, `imagemagick`, `ffmpeg`, and `exiftool` must be installed for
pict-rs to run properly.

View file

@ -5,11 +5,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1718895438,
"narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=",
"lastModified": 1731139594,
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3",
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "github"
},
"original": {

View file

@ -15,12 +15,12 @@
in
{
packages = rec {
imagemagick7_pict-rs = pkgs.callPackage ./nix/pkgs/imagemagick_pict-rs {};
imagemagick_pict-rs = pkgs.callPackage ./nix/pkgs/imagemagick_pict-rs {};
ffmpeg6_pict-rs = pkgs.callPackage ./nix/pkgs/ffmpeg_pict-rs {};
pict-rs = pkgs.callPackage ./pict-rs.nix {
inherit (pkgs.darwin.apple_sdk.frameworks) Security;
inherit imagemagick7_pict-rs ffmpeg6_pict-rs;
inherit imagemagick_pict-rs ffmpeg6_pict-rs;
};
default = pict-rs;
@ -54,7 +54,7 @@
diesel-cli
exiftool
garage
self.packages.${system}.imagemagick7_pict-rs
self.packages.${system}.imagemagick_pict-rs
self.packages.${system}.ffmpeg6_pict-rs
jq
minio-client

View file

@ -1,6 +1,6 @@
{ imagemagick7 }:
{ imagemagick }:
imagemagick7.override {
imagemagick.override {
bzip2Support = true;
zlibSupport = true;
libX11Support = false;