1
0
Fork 0
mirror of https://codeberg.org/icewind/vbsp.git synced 2026-06-03 10:44:07 +02:00

check msrv

This commit is contained in:
Robin Appelman 2023-11-11 22:03:39 +01:00
commit 903402419d
4 changed files with 69 additions and 18 deletions

View file

@ -48,4 +48,17 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Check semver - name: Check semver
uses: obi1kenobi/cargo-semver-checks-action@v2 uses: obi1kenobi/cargo-semver-checks-action@v2
msrv:
runs-on: ubuntu-latest
needs: check
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v20
- uses: icewind1991/attic-action@v1
with:
name: ci
instance: https://cache.icewind.me
authToken: '${{ secrets.ATTIC_TOKEN }}'
- run: nix build .#msrv

2
Cargo.lock generated
View file

@ -320,7 +320,7 @@ checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
[[package]] [[package]]
name = "vbsp" name = "vbsp"
version = "0.1.0" version = "0.2.0"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"binrw", "binrw",

View file

@ -9,6 +9,7 @@ license = "MIT"
edition = "2021" edition = "2021"
readme = "README.md" readme = "README.md"
exclude = ["*.bsp"] exclude = ["*.bsp"]
rust-version = "1.62.0"
[dependencies] [dependencies]
arrayvec = "0.7.2" arrayvec = "0.7.2"

View file

@ -17,33 +17,70 @@
rust-overlay, rust-overlay,
}: }:
utils.lib.eachDefaultSystem (system: let utils.lib.eachDefaultSystem (system: let
overlays = [ (import rust-overlay) ]; overlays = [(import rust-overlay)];
pkgs = (import nixpkgs) { pkgs = (import nixpkgs) {
inherit system overlays; inherit system overlays;
}; };
lib = pkgs.lib; inherit (pkgs) lib callPackage rust-bin mkShell;
naersk' = pkgs.callPackage naersk {}; inherit (lib.sources) sourceByRegex;
src = lib.sources.sourceByRegex (lib.cleanSource ./.) ["Cargo.*" "(src|derive|benches|tests|examples|koth_bagel.*)(/.*)?"];
msrv = (fromTOML (readFile ./Cargo.toml)).package.rust-version;
inherit (builtins) fromTOML readFile;
toolchain = rust-bin.stable.latest.default;
msrvToolchain = rust-bin.stable."${msrv}".default;
naersk' = callPackage naersk {
rustc = toolchain;
cargo = toolchain;
};
msrvNaersk = callPackage naersk {
rustc = msrvToolchain;
cargo = msrvToolchain;
};
src = sourceByRegex ./. ["Cargo.*" "(src|derive|benches|tests|examples|koth_bagel.*)(/.*)?"];
nearskOpt = { nearskOpt = {
pname = "vbsp"; pname = "vbsp";
root = src; root = src;
}; };
in rec { in rec {
packages = { packages = {
check = naersk'.buildPackage (nearskOpt // { check = naersk'.buildPackage (nearskOpt
mode = "check"; // {
}); mode = "check";
clippy = naersk'.buildPackage (nearskOpt // { });
mode = "clippy"; clippy = naersk'.buildPackage (nearskOpt
}); // {
test = naersk'.buildPackage (nearskOpt // { mode = "clippy";
release = false; });
mode = "test"; test = naersk'.buildPackage (nearskOpt
}); // {
release = false;
mode = "test";
});
msrv = msrvNaersk.buildPackage (nearskOpt
// {
mode = "check";
});
}; };
devShells.default = pkgs.mkShell { devShells = let
nativeBuildInputs = with pkgs; [rustc cargo bacon cargo-edit cargo-outdated clippy cargo-audit cargo-msrv cargo-fuzz cargo-semver-checks]; tools = with pkgs; [
bacon
cargo-edit
cargo-outdated
cargo-audit
cargo-msrv
cargo-fuzz
cargo-semver-checks
];
in {
default = mkShell {
nativeBuildInputs = [toolchain] ++ tools;
};
msrv = mkShell {
nativeBuildInputs = [msrvToolchain] ++ tools;
};
}; };
}); });
} }