Skip to content

Merge v1.20 into v1.x #1738

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
Oct 29, 2024
Merged

Merge v1.20 into v1.x #1738

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
4bd9a76
Enable PHP 8.4 testing on PPC and Zseries (#1737)
alcaeus Oct 29, 2024
cb33aef
Merge branch 'v1.x' into merge-v1.20-into-v1.x-1730213521050
alcaeus Oct 29, 2024
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
11 changes: 0 additions & 11 deletions .evergreen/config/build-task-groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,6 @@ task_groups:
tasks:
- ".build"

# TODO: Remove task group once PHP 8.4 is available on PPC and Zseries
- name: "build-all-php-except-8.4"
# Keep this number in sync with the number of PHP versions to allow for parallel builds
max_hosts: 4
setup_task: *build_setup
setup_task_can_fail_task: true
setup_task_timeout_secs: 1800
teardown_task: *build_teardown
tasks:
- ".build !.php8.4"

- name: "build-php-libmongoc"
# Keep this in sync with the actual number of libmongoc builds (typically 3) defined in _template-build-libmongoc.yml
max_hosts: 2
Expand Down
6 changes: 2 additions & 4 deletions .evergreen/config/build-variants.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ buildvariants:
tags: ["build", "rhel", "zseries", "tag"]
run_on: rhel8-zseries-small
tasks:
# TODO: Re-enable PHP 8.4 once it's available on PPC and Zseries
- name: "build-all-php-except-8.4"
- name: "build-all-php"
- name: build-rhel8-arm64
display_name: "Build: RHEL 8 ARM64"
tags: ["build", "rhel", "arm64", "tag"]
Expand All @@ -42,8 +41,7 @@ buildvariants:
tags: ["build", "rhel", "power8", "tag"]
run_on: rhel8-power-large
tasks:
# TODO: Re-enable PHP 8.4 once it's available on PPC and Zseries
- name: "build-all-php-except-8.4"
- name: "build-all-php"
- name: build-rhel8
display_name: "Build: RHEL 8 x64"
tags: ["build", "rhel", "x64", "pr", "tag"]
Expand Down
Loading