Skip to content

Commit d9c5af6

Browse files
Merge v1.20 into v1.x (#1702)
2 parents 837285d + c1609ac commit d9c5af6

File tree

3 files changed

+24
-36
lines changed

3 files changed

+24
-36
lines changed

.evergreen/config/build-variants.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,6 @@ buildvariants:
1616
run_on: debian11-small
1717
tasks:
1818
- name: "build-all-php"
19-
- name: build-debian10
20-
display_name: "Build: Debian 10"
21-
tags: ["build", "debian", "x64", "pr", "tag"]
22-
run_on: debian10-small
23-
tasks:
24-
- name: "build-all-php"
25-
- name: build-debian92
26-
display_name: "Build: Debian 9.2"
27-
tags: ["build", "debian", "x64", "pr", "tag"]
28-
run_on: debian92-small
29-
tasks:
30-
- name: "build-all-php"
3119

3220
# RHEL
3321
- name: build-rhel90

.evergreen/config/generated/test-variant/php-full.yml

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

.evergreen/config/templates/test-variant/php-full.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@
5757
- ".ocsp .5.0"
5858

5959
# Test versions < 5.0
60-
- name: test-debian92-php-%phpVersion%
61-
tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"]
62-
display_name: "Test: Debian 9.2, PHP %phpVersion%"
63-
run_on: debian92-small
60+
- name: test-rhel80-php-%phpVersion%
61+
tags: ["test", "rhel", "x64", "php%phpVersion%", "pr", "tag"]
62+
display_name: "Test: RHEL 8.0, PHP %phpVersion%"
63+
run_on: rhel80-small
6464
expansions:
65-
FETCH_BUILD_VARIANT: "build-debian92"
65+
FETCH_BUILD_VARIANT: "build-rhel8"
6666
FETCH_BUILD_TASK: "build-php-%phpVersion%"
6767
depends_on:
68-
- variant: "build-debian92"
68+
- variant: "build-rhel8"
6969
name: "build-php-%phpVersion%"
7070
tasks:
7171
# Remember to add new major versions here as they are released

0 commit comments

Comments
 (0)