Skip to content

Merge v1.20 into v1.x #1729

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

Closed
wants to merge 2 commits into from
Closed

Merge v1.20 into v1.x #1729

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
0464c55
Update to latest setup-php-sdk version (#1726)
alcaeus Oct 16, 2024
a7f0e3d
Skip building against libmongoc master (#1728)
alcaeus Oct 17, 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
2 changes: 1 addition & 1 deletion .evergreen/config/build-task-groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ task_groups:

- 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: 3
max_hosts: 2
setup_task: *build_setup
setup_task_can_fail_task: true
setup_task_timeout_secs: 1800
Expand Down
18 changes: 10 additions & 8 deletions .evergreen/config/generated/build/build-libmongoc.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions .evergreen/config/generated/test-variant/legacy-php-full.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 30 additions & 30 deletions .evergreen/config/generated/test-variant/libmongoc.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions .evergreen/config/generated/test-variant/modern-php-full.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 10 additions & 8 deletions .evergreen/config/templates/build/build-libmongoc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@
LIBMONGOC_VERSION: "r1.28"
- func: "upload build"

- name: "build-php-%phpVersion%-libmongoc-latest"
tags: ["build-libmongoc", "php%phpVersion%"]
commands:
- func: "compile driver"
vars:
PHP_VERSION: "%phpVersion%"
LIBMONGOC_VERSION: "master"
- func: "upload build"
# TODO: this currently fails as libmongoc master needs changes to build directories
# We can re-enable this after switching to 1.29-dev
# - name: "build-php-%phpVersion%-libmongoc-latest"
# tags: ["build-libmongoc", "php%phpVersion%"]
# commands:
# - func: "compile driver"
# vars:
# PHP_VERSION: "%phpVersion%"
# LIBMONGOC_VERSION: "master"
# - func: "upload build"
1 change: 0 additions & 1 deletion .evergreen/config/templates/test-variant/legacy-php-full.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
- ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest"
- ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest"
- ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest"
- ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest"
- ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest"
display_tasks:
- name: "test-ocsp-4.4"
Expand Down
60 changes: 30 additions & 30 deletions .evergreen/config/templates/test-variant/libmongoc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,33 +61,33 @@
execution_tasks:
- ".ocsp .7.0"

- name: test-debian12-php-%phpVersion%-libmongoc-latest
tags: ["test", "libmongoc", "debian", "x64", "php%phpVersion%"]
display_name: "Test: Debian 12, PHP %phpVersion%, libmongoc latest"
run_on: debian12-small
expansions:
FETCH_BUILD_VARIANT: "build-debian12"
FETCH_BUILD_TASK: "build-php-%phpVersion%-libmongoc-latest"
depends_on:
- variant: "build-debian12"
name: "build-php-%phpVersion%-libmongoc-latest"
tasks:
- ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
- ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
- ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
- ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
- "test-atlas-connectivity"
- ".ocsp !.4.4 !.5.0 !.6.0"
display_tasks:
- name: "test-ocsp-latest"
execution_tasks:
- ".ocsp .latest"
- name: "test-ocsp-rapid"
execution_tasks:
- ".ocsp .rapid"
- name: "test-ocsp-8.0"
execution_tasks:
- ".ocsp .8.0"
- name: "test-ocsp-7.0"
execution_tasks:
- ".ocsp .7.0"
# - name: test-debian12-php-%phpVersion%-libmongoc-latest
# tags: ["test", "libmongoc", "debian", "x64", "php%phpVersion%"]
# display_name: "Test: Debian 12, PHP %phpVersion%, libmongoc latest"
# run_on: debian12-small
# expansions:
# FETCH_BUILD_VARIANT: "build-debian12"
# FETCH_BUILD_TASK: "build-php-%phpVersion%-libmongoc-latest"
# depends_on:
# - variant: "build-debian12"
# name: "build-php-%phpVersion%-libmongoc-latest"
# tasks:
# - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
# - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
# - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
# - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
# - "test-atlas-connectivity"
# - ".ocsp !.4.4 !.5.0 !.6.0"
# display_tasks:
# - name: "test-ocsp-latest"
# execution_tasks:
# - ".ocsp .latest"
# - name: "test-ocsp-rapid"
# execution_tasks:
# - ".ocsp .rapid"
# - name: "test-ocsp-8.0"
# execution_tasks:
# - ".ocsp .8.0"
# - name: "test-ocsp-7.0"
# execution_tasks:
# - ".ocsp .7.0"
1 change: 0 additions & 1 deletion .evergreen/config/templates/test-variant/modern-php-full.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
- ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest"
- ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest"
- ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest"
- ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest"
- ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest"
display_tasks:
- name: "test-ocsp-4.4"
Expand Down
3 changes: 2 additions & 1 deletion .github/actions/windows/prepare-build/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,13 @@ runs:

- name: Setup PHP SDK
id: setup-php
uses: php/setup-php-sdk@v0.9
uses: php/setup-php-sdk@v0.10
with:
version: ${{ inputs.version }}
arch: ${{ inputs.arch }}
ts: ${{ inputs.ts }}
deps: openssl
cache: true

- name: Enable Developer Command Prompt
uses: ilammy/msvc-dev-cmd@v1
Expand Down