fix github CI, part 1 (#728)

* run ci on main branch as well

* reuse matrix in check action

* run dummy job

* check msrv with min deps

* extract msrv from toml

* fix msrv rendering in gh-action

* fix wasm check

* shell check

* edit check action

* fix pip install toml-cli

* add echo log to vars action

* set msrv properly

* fix toml-cli cmd name

* fix toml-cli cmd options

* add checkout for vars job

* try to replace deprecated doc_auto_cfg

* fix warning

* lock nightly version

* add comment for rust release history

* use stable clippy

* use msrv clippy

* update sdl2

* use nightly clippy despite errors

* lock nightly version

* fix typo in toolchain

* fix typo in needs vars

* install cmake for non linux targets

* downgrade nightly version for tests

* update nightly channel for tests

* install cmake for macos only

* use 1 nightly across all workflows

* redut doc_auto_cfg back

* comment doc_auto_cfg

Author: cospectrum

.github/workflows/check.yml

@@ -5,15 +5,16 @@
 # - doc: checks that the code can be documented without errors
 # - hack: check combinations of feature flags
 # - msrv: check that the msrv specified in the crate is correct
-# - semver: check API changes for semver violations.
+# - wasm: check wasm target
+# - semver: check API changes for semver violations
 permissions:
   contents: read
 # This configuration allows maintainers of this repo to create a branch and pull request based on
 # the new branch. Restricting the push trigger to the main branch ensures that the PR only gets
 # built once.
 on:
   push:
-    branches: [master]
+    branches: [master, main]
   pull_request:
 # If new code is pushed to a PR branch, then cancel in progress workflows for that PR. Ensures that
 # we don't waste CI time, and returns results quicker https://github.com/jonhoo/rust-ci-conf/pull/5
@@ -22,20 +23,41 @@ concurrency:
   cancel-in-progress: true
 name: check
 jobs:
+  vars:
+    runs-on: ubuntu-latest
+    # https://rust-lang.github.io/rustup-components-history/
+    outputs:
+      nightly: nightly-2025-10-21
+      stable: 1.90.0
+      msrv: ${{ steps.variables.outputs.msrv }}
+    steps:
+      - uses: actions/checkout@v4
+      - id: variables
+        run: |
+          pip install toml-cli==0.8.2
+          msrv=$(toml get --toml-path=Cargo.toml package.rust-version)
+          echo "msrv=${msrv}"
+          echo "msrv=${msrv}" >> "$GITHUB_OUTPUT"
   fmt:
+    needs: vars
     runs-on: ubuntu-latest
-    name: stable / fmt
+    strategy:
+      matrix:
+        toolchain: ["${{ needs.vars.outputs.stable }}"]
+    name: ${{ matrix.toolchain }} / fmt
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Install stable
-        uses: dtolnay/rust-toolchain@stable
+      - name: Install ${{ matrix.toolchain }}
+        uses: dtolnay/rust-toolchain@master
         with:
+          toolchain: ${{ matrix.toolchain }}
           components: rustfmt
       - name: cargo fmt --check
         run: cargo fmt --check
   clippy:
+    needs: vars
     runs-on: ubuntu-latest
     name: ${{ matrix.toolchain }} / clippy
     permissions:
@@ -44,7 +66,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        toolchain: [nightly-2024-11-15]
+        toolchain: ["${{ needs.vars.outputs.nightly }}"]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -62,54 +84,83 @@ jobs:
     # run docs generation on nightly rather than stable. This enables features like
     # https://doc.rust-lang.org/beta/unstable-book/language-features/doc-cfg.html which allows an
     # API be documented as only available in some specific platforms.
+    needs: vars
     runs-on: ubuntu-latest
-    name: nightly / doc
+    strategy:
+      matrix:
+        toolchain: ["${{ needs.vars.outputs.nightly }}"]
+    name: ${{ matrix.toolchain }} / doc
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Install nightly
-        uses: dtolnay/rust-toolchain@nightly
+      - name: Install ${{ matrix.toolchain }}
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ matrix.toolchain }}
       - name: cargo doc
         run: cargo doc --no-deps --all-features
         env:
           RUSTDOCFLAGS: -D warnings --cfg docsrs
   hack:
     # cargo-hack checks combinations of feature flags to ensure that features are all additive
     # which is required for feature unification
+    needs: vars
     runs-on: ubuntu-latest
-    name: ubuntu / stable / features
+    strategy:
+      matrix:
+        toolchain: ["${{ needs.vars.outputs.stable }}"]
+    name: ubuntu / ${{ matrix.toolchain }} / features
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Install stable
-        uses: dtolnay/rust-toolchain@stable
+      - name: Install ${{ matrix.toolchain }}
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ matrix.toolchain }}
       - name: cargo install cargo-hack
         uses: taiki-e/install-action@cargo-hack
       # intentionally no target specifier; see https://github.com/jonhoo/rust-ci-conf/pull/4
       # --feature-powerset runs for every combination of features
       - name: cargo hack
         run: cargo hack --feature-powerset check
   msrv:
-    # check that we can build using the minimal rust version that is specified by this crate
+    needs: vars
     runs-on: ubuntu-latest
-    # we use a matrix here just because env can't be used in job names
-    # https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability
     strategy:
       matrix:
-        msrv: ["1.80.1"] # Don't forget to update the `rust-version` in Cargo.toml as well
+        msrv: ["${{ needs.vars.outputs.msrv }}"]
     name: ubuntu / ${{ matrix.msrv }}
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
+      - name: Install ${{ needs.vars.outputs.nightly }}
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ needs.vars.outputs.nightly }}
+      # Generate Cargo.lock with minimal versions
+      - name: Update dependencies to minimal versions
+        run: cargo +nightly update -Zdirect-minimal-versions
       - name: Install ${{ matrix.msrv }}
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.msrv }}
-      - name: cargo +${{ matrix.msrv }} check
-        run: cargo check
+      - run: cargo +${{ matrix.msrv }} check --locked
+        env:
+          RUSTFLAGS: -D warnings
+  wasm:
+    needs: vars
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ needs.vars.outputs.stable }}
+          targets: wasm32-unknown-unknown
+      - name: cargo check
+        run: cargo check --target wasm32-unknown-unknown
         env:
           RUSTFLAGS: -D warnings
   semver:

.github/workflows/safety.yml

@@ -8,7 +8,7 @@ permissions:
   contents: read
 on:
   push:
-    branches: [master]
+    branches: [master, main]
   pull_request:
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

.github/workflows/scheduled.yml

@@ -5,7 +5,7 @@ permissions:
   contents: read
 on:
   push:
-    branches: [master]
+    branches: [master, main]
   pull_request:
   schedule:
     - cron:  '7 7 * * *'
@@ -14,10 +14,21 @@ concurrency:
   cancel-in-progress: true
 name: rolling
 jobs:
+  vars:
+    runs-on: ubuntu-latest
+    # https://rust-lang.github.io/rustup-components-history/
+    outputs:
+      nightly: nightly-2025-10-21
+    steps:
+      - run: echo "dummy job"
   # https://twitter.com/mycoliza/status/1571295690063753218
   nightly:
+    needs: vars
     runs-on: ubuntu-latest
-    name: ubuntu / nightly
+    name: ubuntu / ${{ matrix.toolchain }}
+    strategy:
+      matrix:
+        toolchain: ["${{ needs.vars.outputs.nightly }}"]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -36,8 +47,12 @@ jobs:
     # of this crate will generally use the latest available crates. This is subject to the standard
     # Cargo semver rules (i.e cargo does not update to a new major version unless explicitly told
     # to).
+    needs: vars
     runs-on: ubuntu-latest
-    name: ubuntu / nightly / updated
+    name: ubuntu / ${{ matrix.toolchain }} / updated
+    strategy:
+      matrix:
+        toolchain: ["${{ needs.vars.outputs.nightly }}"]
     # There's no point running this if no Cargo.lock was checked in in the first place, since we'd
     # just redo what happened in the regular test job. Unfortunately, hashFiles only works in if on
     # steps, so we repeat it.
@@ -47,7 +62,9 @@ jobs:
           submodules: true
       - name: Install nightly
         if: hashFiles('Cargo.lock') != ''
-        uses: dtolnay/rust-toolchain@nightly
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ matrix.toolchain }}
       - name: cargo update
         if: hashFiles('Cargo.lock') != ''
         run: cargo update

.github/workflows/test.yml

@@ -9,19 +9,27 @@ permissions:
   contents: read
 on:
   push:
-    branches: [master]
+    branches: [master, main]
   pull_request:
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 name: test
 jobs:
+  vars:
+    runs-on: ubuntu-latest
+    # https://rust-lang.github.io/rustup-components-history/
+    outputs:
+      nightly: nightly-2025-10-21
+    steps:
+      - run: echo "dummy job"
   required:
+    needs: vars
     runs-on: ubuntu-latest
     name: ubuntu / ${{ matrix.toolchain }}
     strategy:
       matrix:
-        toolchain: [nightly]
+        toolchain: ["${{ needs.vars.outputs.nightly }}"]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -41,26 +49,34 @@ jobs:
       - name: cargo test --doc
         run: cargo test --locked --all-features --doc
   direct-minimal:
+    needs: vars
+    strategy:
+      matrix:
+        toolchain: ["${{ needs.vars.outputs.nightly }}"]
     runs-on: ubuntu-latest
-    name: ubuntu / nightly / direct-minimal-versions
+    name: ubuntu / ${{ matrix.toolchain }} / direct-minimal-versions
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Install nightly
-        uses: dtolnay/rust-toolchain@nightly
+      - name: Install ${{ matrix.toolchain }}
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ matrix.toolchain }}
       - name: cargo update -Zdirect-minimal-versions
         run: cargo update -Zdirect-minimal-versions
       - name: cargo test
         run: cargo test --locked --all-features --all-targets
   os-check:
     # run cargo test on mac and windows
+    needs: vars
     runs-on: ${{ matrix.os }}
-    name: ${{ matrix.os }} / nightly
+    name: ${{ matrix.os }} / ${{ matrix.toolchain }}
     strategy:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest]
+        toolchain: ["${{ needs.vars.outputs.nightly }}"]
     steps:
       # if your project needs OpenSSL, uncomment this to fix Windows builds.
       # it's commented out by default as the install command takes 5-10m.
@@ -71,8 +87,15 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Install nightly
-        uses: dtolnay/rust-toolchain@nightly
+      - name: Setup cmake
+        if: matrix.os == 'macos-latest'
+        uses: jwlawson/actions-setup-cmake@v2
+        with:
+          cmake-version: '3.6.0'
+      - name: Install ${{ matrix.toolchain }}
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ matrix.toolchain }}
       - name: cargo generate-lockfile
         if: hashFiles('Cargo.lock') == ''
         run: cargo generate-lockfile

.github/workflows/wasm.yml

@@ -2,8 +2,7 @@
 name = "imageproc"
 version = "0.26.0"
 authors = ["theotherphil"]
-# note: when changed, also update `msrv` in `.github/workflows/check.yml`
-rust-version = "1.80.1"
+rust-version = "1.81.0"
 edition = "2021"
 license = "MIT"
 description = "Image processing operations"
@@ -32,7 +31,7 @@ rand = { version = "0.8.5", default-features = false, features = [
 ] }
 rand_distr = { version = "0.4.3", default-features = false }
 rayon = { version = "1.8.0", optional = true, default-features = false }
-sdl2 = { version = "0.36", optional = true, default-features = false, features = [
+sdl2 = { version = "0.38.0", optional = true, default-features = false, features = [
     "bundled",
 ] }
 katexit = { version = "0.1.4", optional = true, default-features = false }
@@ -49,7 +48,7 @@ wasm-bindgen-test = "0.3.38"
 [package.metadata.docs.rs]
 # See https://github.com/image-rs/imageproc/issues/358
 # all-features = true
-features = ["property-testing", "katexit"]
+features = ["katexit"]
 
 [profile.release]
 opt-level = 3

Cargo.toml

@@ -1,7 +1,7 @@
 #![doc = include_str!("../README.md")]
 #![deny(missing_docs)]
 #![cfg_attr(test, feature(test))]
-#![cfg_attr(docsrs, feature(doc_auto_cfg))]
+// #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 #![allow(
     clippy::too_long_first_doc_paragraph,
     clippy::zero_prefixed_literal,

src/lib.rs

@@ -392,7 +392,7 @@ mod methods {
     }
 
     fn square_sum(input: &GrayImage) -> f32 {
-        input.iter().map(|&x| (x as f32 * x as f32)).sum()
+        input.iter().map(|&x| x as f32 * x as f32).sum()
     }
     fn mult_square_sum(a: &GrayImage, b: &GrayImage) -> f32 {
         a.iter()