Skip to content

Merge v1.x into v2.0 #1816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 14, 2025
Merged

Merge v1.x into v2.0 #1816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94b1dd1
PHPC-2537 Update to newer Ubuntu version in GitHub Actions workflows …
GromNaN Apr 11, 2025
0629d11
Merge v1.21 into v1.x (#1815)
alcaeus Apr 14, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/arginfo-files.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
jobs:
check-arginfo:
name: "Check generated arginfo files"
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-24.04"

steps:
- name: "Checkout"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clang-format.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
jobs:
coding-standards:
name: "Coding Standards"
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-24.04"

steps:
- name: "Checkout"
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,32 +19,32 @@ jobs:
fail-fast: true
matrix:
os:
- "ubuntu-20.04"
- "ubuntu-22.04"
php-version:
- "8.1"
- "8.2"
- "8.3"
- "8.4"
mongodb-version:
- "4.4"
- "6.0"
topology:
- "server"
include:
- os: "ubuntu-20.04"
- os: "ubuntu-24.04"
php-version: "8.1"
mongodb-version: "6.0"
mongodb-version: "8.0"
topology: "replica_set"
- os: "ubuntu-20.04"
- os: "ubuntu-24.04"
php-version: "8.1"
mongodb-version: "6.0"
mongodb-version: "8.0"
topology: "sharded_cluster"
- os: "ubuntu-20.04"
- os: "ubuntu-22.04"
php-version: "8.1"
mongodb-version: "4.4"
mongodb-version: "6.0"
topology: "replica_set"
- os: "ubuntu-20.04"
- os: "ubuntu-22.04"
php-version: "8.1"
mongodb-version: "4.4"
mongodb-version: "6.0"
topology: "sharded_cluster"

steps:
Expand Down
2 changes: 1 addition & 1 deletion scripts/clang-format.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ if [ -z "$CLANG_FORMAT" ]; then
exit
fi

VERSION=`$CLANG_FORMAT -version | cut -d " " -f 3`
VERSION=`$CLANG_FORMAT -version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+'`
VERSION_MAJOR=`echo $VERSION | cut -d "." -f 1`

if [ $VERSION_MAJOR -lt 6 ]; then
Expand Down
2 changes: 1 addition & 1 deletion src/phongo_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1128,7 +1128,7 @@ static mongoc_client_t* php_phongo_make_mongo_client(const mongoc_uri_t* uri, zv
#ifdef HAVE_SYSTEM_LIBBSON
bson_version = bson_get_version();
#else
bson_version = "bundled";
bson_version = "bundled";
#endif

MONGOC_DEBUG(
Expand Down
2 changes: 1 addition & 1 deletion src/phongo_compat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
#define PHONGO_PARSE_PARAMETERS_END() \
ZEND_PARSE_PARAMETERS_END_EX( \
zend_restore_error_handling(&error_handling); \
return ); \
return); \
zend_restore_error_handling(&error_handling); \
} \
while (0)
Expand Down
Loading