Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
## box.phar requires php72
php-version: '7.4'
## box.phar requires php82
php-version: '8.2'
tools: composer:v2
extensions: pcntl

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
php: 8.3
phpunit: 9
- operating-system: ubuntu-latest
php: 8.4
php: 8.5
phpunit: 9
## We used to test here, but we were forced to switch to newer actions.
## But these actions don't seem to run on Windows...
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"extra": {
"downloads": {
"box": {
"url": "https://github.com/humbug/box/releases/download/3.16.0/box.phar",
"url": "https://github.com/box-project/box/releases/download/4.6.10/box.phar",
"path": "extern/box",
"type": "phar"
}
Expand Down
6 changes: 3 additions & 3 deletions nix/buildkit.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ pkgs ? import <nixpkgs> {} }:

## Get civicrm-buildkit from github.
## Based on "master" branch circa 2024-02-26 04:30 UTC
## Based on "master" branch circa 2026-01-30 04:33 UTC
import (pkgs.fetchzip {
url = "https://github.com/civicrm/civicrm-buildkit/archive/d6f6b8dd2d5944c35cd78cb319fef21673214b35.tar.gz";
sha256 = "02p2yzdfgv66a2zf8i36h6pjfi78wnp92m3klij7fqbfd9mpvi5a";
url = "https://github.com/civicrm/civicrm-buildkit/archive/c1dbe963785e8205307a58ecb1dc826f9f8abb25.tar.gz";
sha256 = "12csnfk6246msiadqkdjlxk943xb0bwnrhksnvbhw5mm8a2gy4ym";
})

## Get a local copy of civicrm-buildkit. (Useful for developing patches.)
Expand Down
2 changes: 1 addition & 1 deletion scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ export PATH="$PRJDIR/extern:$PATH"
set -ex
composer install --prefer-dist --no-progress --no-suggest --no-dev
which box
php -d phar.read_only=0 `which box` build -v
php -d phar.read_only=0 `which box` compile -v
2 changes: 1 addition & 1 deletion shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ in
pkgs.mkShell {
nativeBuildInputs = buildkit.profiles.base ++ [

(buildkit.pins.v2305.php82.buildEnv {
(buildkit.pins.v2505.php82.buildEnv {
extraConfig = ''
memory_limit=-1
'';
Expand Down
2 changes: 1 addition & 1 deletion tests/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#### Extra - Register classes in "tests" directory
$loader->add('GitScan', __DIR__);

$userEmail = trim(shell_exec('git config --get user.email'));
$userEmail = trim(shell_exec('git config --get user.email') ?? '');
if (strpos($userEmail, '(none)') !== false || $userEmail === '') {
shell_exec('git config --global user.email "testbot@example.com"');
shell_exec('git config --global user.name "Test Bot"');
Expand Down