mirror of
https://github.com/ipetkov/crane.git
synced 2024-11-22 23:17:15 +03:00
ci: test against 22.11 and stop testing 22.05 (#179)
This commit is contained in:
parent
fb80a689c5
commit
ea271bdc05
14
.github/workflows/test.yml
vendored
14
.github/workflows/test.yml
vendored
@ -30,9 +30,9 @@ jobs:
|
||||
include:
|
||||
# Latest and greatest release of Nix
|
||||
- install_url: https://nixos.org/nix/install
|
||||
# The 22.05 branch ships with Nix 2.8.1
|
||||
- install_url: https://releases.nixos.org/nix/nix-2.8.1/install
|
||||
nixpkgs-override: "--override-input nixpkgs github:NixOS/nixpkgs/release-22.05"
|
||||
# The 22.11 branch ships with Nix 2.11.0
|
||||
- install_url: https://releases.nixos.org/nix/nix-2.11.0/install
|
||||
nixpkgs-override: "--override-input nixpkgs github:NixOS/nixpkgs/release-22.11"
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
@ -58,13 +58,13 @@ jobs:
|
||||
# Latest and greatest release of Nix
|
||||
install_url: https://nixos.org/nix/install
|
||||
- os: ubuntu-latest
|
||||
# The 22.05 branch ships with Nix 2.8.1
|
||||
install_url: https://releases.nixos.org/nix/nix-2.8.1/install
|
||||
nixpkgs-override: "--override-input nixpkgs github:NixOS/nixpkgs/release-22.05"
|
||||
# The 22.11 branch ships with Nix 2.11.0
|
||||
install_url: https://releases.nixos.org/nix/nix-2.11.0/install
|
||||
nixpkgs-override: "--override-input nixpkgs github:NixOS/nixpkgs/release-22.11"
|
||||
- os: macos-12
|
||||
# Latest and greatest release of Nix
|
||||
install_url: https://nixos.org/nix/install
|
||||
nixpkgs-override: "--override-input nixpkgs github:NixOS/nixpkgs/nixpkgs-22.05-darwin"
|
||||
nixpkgs-override: "--override-input nixpkgs github:NixOS/nixpkgs/nixpkgs-22.11-darwin"
|
||||
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
|
@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
||||
|
||||
## Unreleased
|
||||
|
||||
### Changed
|
||||
* **Breaking**: dropped compatibility for Nix versions below 2.11.0
|
||||
* **Breaking**: dropped compatibility for nixpkgs-22.05. nixpkgs-22.11 and
|
||||
nixpkgs-unstable are fully supported
|
||||
|
||||
## [0.10.0] - 2022-12-01
|
||||
|
||||
### Added
|
||||
|
@ -335,10 +335,10 @@ in
|
||||
pname = "workspace-hack";
|
||||
};
|
||||
|
||||
workspaceInheritance = lib.optionalAttrs (lib.versionAtLeast pkgs.cargo.version "1.64.0") (myLib.buildPackage {
|
||||
workspaceInheritance = myLib.buildPackage {
|
||||
src = myLib.cleanCargoSource ./workspace-inheritance;
|
||||
pname = "workspace-inheritance";
|
||||
});
|
||||
};
|
||||
|
||||
workspaceRoot = myLib.buildPackage {
|
||||
src = myLib.cleanCargoSource ./workspace-root;
|
||||
|
@ -1,15 +1,8 @@
|
||||
{ cargo-nextest
|
||||
, cargoNextest
|
||||
, lib
|
||||
{ cargoNextest
|
||||
, runCommand
|
||||
}:
|
||||
|
||||
let
|
||||
# cargo-nextest version in the stable-22.05 branch is too old
|
||||
nextestSupportsArchives = lib.versionAtLeast
|
||||
cargo-nextest.version
|
||||
"0.9.15";
|
||||
|
||||
nextestSimple = cargoNextest {
|
||||
src = ./simple;
|
||||
pname = "nextest-simple";
|
||||
@ -34,10 +27,11 @@ let
|
||||
in
|
||||
runCommand "nextestTests"
|
||||
{
|
||||
buildInputs = [ nextestSimple ] ++ (lib.optionals nextestSupportsArchives [
|
||||
buildInputs = [
|
||||
nextestSimple
|
||||
nextestPartitionsCount
|
||||
nextestPartitionsHash
|
||||
]);
|
||||
];
|
||||
} ''
|
||||
mkdir -p $out
|
||||
''
|
||||
|
Loading…
Reference in New Issue
Block a user