Skip to content

Commit 9e40011

Browse files
committed
Add PHP 8.5 to tests
Use PHP 8.5 from nixos-unstable. Although 8.5 is in nixos-25.11, building the imagick extension fails.
1 parent 1ca342c commit 9e40011

4 files changed

Lines changed: 27 additions & 2 deletions

File tree

bin/test-php-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ set -euo pipefail
44
parallel -j "${1:-$(nproc)}" --tagstring "{1}" --line-buffer '
55
echo "Testing {1}"
66
PHP_PACKAGE="{1}" nix flake check --impure ./dev
7-
' ::: php84 php83 php82
7+
' ::: php85 php84 php83 php82

bin/test-releases

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ set -euo pipefail
55
parallel -j "${1:-$(nproc)}" --tagstring "{1} {2}" --line-buffer '
66
echo "Testing {2} with {1}"
77
PHP_PACKAGE="{1}" STATIC_DEPLOY_PACKAGE="{2}" nix flake check --impure ./dev
8-
' ::: php84 php82 ::: plugin pluginWpOrg
8+
' ::: php85 php82 ::: plugin pluginWpOrg

dev/flake.lock

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/flake.nix

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
inputs = {
33
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
4+
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
45
flake-parts.url = "github:hercules-ci/flake-parts";
56
systems.url = "github:nix-systems/default";
67
hyperfine-flake = {
@@ -62,6 +63,7 @@
6263
let
6364
system = pkgs.stdenv.hostPlatform.system;
6465
getEnv = name: default: (if "" == builtins.getEnv name then default else builtins.getEnv name);
66+
nixpkgs-unstable = import inputs.nixpkgs-unstable { inherit system; };
6567
phpPackage = getEnv "PHP_PACKAGE" "php";
6668
phpExtensionsName = phpPackage + "Extensions";
6769
staticDeployPackage = getEnv "STATIC_DEPLOY_PACKAGE" "pluginWpOrg";
@@ -83,6 +85,11 @@
8385
imagick
8486
memcached
8587
]);
88+
otherPhpVersionsOverlay = self: super: {
89+
php85 = nixpkgs-unstable.php85;
90+
php85Extensions = nixpkgs-unstable.php85Extensions;
91+
php85Packages = nixpkgs-unstable.php85Packages;
92+
};
8693
overlay = self: super: {
8794
php = super.${phpPackage}.buildEnv {
8895
extraConfig = phpOptions;
@@ -96,6 +103,7 @@
96103
finalPkgs = import pkgs.path {
97104
inherit (pkgs) system;
98105
overlays = [
106+
otherPhpVersionsOverlay
99107
overlay
100108
];
101109
};

0 commit comments

Comments
 (0)