Skip to content

Commit e6ac067

Browse files
committed
Merge remote-tracking branch 'origin/develop' into MC-36802
2 parents 223648f + 9ef11a4 commit e6ac067

File tree

94 files changed

+1945
-433
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+1945
-433
lines changed

.github/workflows/php.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: CI
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ master, develop ]
66
pull_request:
7-
branches: [ master ]
7+
branches: [ master, develop ]
88

99
jobs:
1010
build:
@@ -14,6 +14,9 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v2
1616

17+
- name: Update PHP
18+
run: sudo update-alternatives --set php /usr/bin/php7.2
19+
1720
- name: Validate composer
1821
run: composer validate
1922

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "magento/magento-semver",
33
"description": "Magento Semantic Version Checker",
4-
"version": "8.0.0",
4+
"version": "10.0.0",
55
"license": [
66
"OSL-3.0",
77
"AFL-3.0"
@@ -20,6 +20,7 @@
2020
},
2121
"require-dev": {
2222
"phpunit/phpunit": "^6.5.0",
23+
"ext-dom": "*",
2324
"squizlabs/php_codesniffer": "^3.5"
2425
},
2526
"autoload": {

0 commit comments

Comments
 (0)