Skip to content

Commit

Permalink
Merge pull request #897 from phpDocumentor/prepare-next-iteration
Browse files Browse the repository at this point in the history
[TASK] Prepare for next major version
  • Loading branch information
jaapio authored Mar 3, 2024
2 parents d7a2f6a + 8dace4e commit cbfe20e
Show file tree
Hide file tree
Showing 10 changed files with 289 additions and 233 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on: # yamllint disable-line rule:truthy
- "main"

env:
ComposerRootVersion: "1.x-dev"
ComposerRootVersion: "2.x-dev"

jobs:
code-coverage:
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
uses: "phpDocumentor/.github/.github/workflows/[email protected]"
with:
php-version: "8.2"
composer-root-version: "1.x-dev"
composer-root-version: "2.x-dev"

architecture:
name: "Check architecture"
Expand All @@ -78,23 +78,23 @@ jobs:
name: "Unit test"
uses: "phpDocumentor/.github/.github/workflows/[email protected]"
with:
composer-root-version: "1.x-dev"
composer-root-version: "2.x-dev"

functional-tests:
name: "Functional test"
uses: "phpDocumentor/.github/.github/workflows/[email protected]"
needs: "unit-tests"
with:
test-suite: "functional"
composer-root-version: "1.x-dev"
composer-root-version: "2.x-dev"

integration-tests:
name: "integration test"
uses: "phpDocumentor/.github/.github/workflows/[email protected]"
needs: "unit-tests"
with:
test-suite: "integration"
composer-root-version: "1.x-dev"
composer-root-version: "2.x-dev"

xml-lint:
runs-on: "ubuntu-latest"
Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
"php": "^8.1",
"ext-json": "*",
"ext-mbstring": "*",
"phpdocumentor/guides": "^1.0@dev || ^0.3",
"phpdocumentor/guides-cli": "^1.0@dev || ^0.3",
"phpdocumentor/guides-code": "^1.0@dev || ^0.3",
"phpdocumentor/guides-graphs": "^1.0@dev || ^0.3",
"phpdocumentor/guides-markdown": "^1.0@dev || ^0.3",
"phpdocumentor/guides-restructured-text": "^1.0@dev || ^0.3",
"phpdocumentor/guides-theme-bootstrap": "^1.0@dev || ^0.3"
"phpdocumentor/guides": "^2.0@dev || ^1.0",
"phpdocumentor/guides-cli": "^2.0@dev || ^1.0",
"phpdocumentor/guides-code": "^2.0@dev || ^1.0",
"phpdocumentor/guides-graphs": "^2.0@dev || ^1.0",
"phpdocumentor/guides-markdown": "^2.0@dev || ^1.0",
"phpdocumentor/guides-restructured-text": "^2.0@dev || ^1.0",
"phpdocumentor/guides-theme-bootstrap": "^2.0@dev || ^1.0"
},
"require-dev": {
"ext-dom": "*",
Expand Down
Loading

0 comments on commit cbfe20e

Please sign in to comment.