-
-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
1 addition
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -55,12 +55,8 @@ jobs: | |
| uses: "phpDocumentor/.github/.github/workflows/[email protected]" | ||
| with: | ||
| php-version: "8.2" | ||
| <<<<<<< HEAD | ||
| composer-root-version: "1.x-dev" | ||
| ======= | ||
| php-extensions: "none, ctype, dom, json, mbstring, phar, simplexml, tokenizer, xml, xmlwriter, fileinfo, iconv" | ||
| composer-root-version: "2.x-dev" | ||
| >>>>>>> bafbb25a (Add iconv to ci) | ||
|
|
||
| architecture: | ||
| name: "Check architecture" | ||
|
|
@@ -87,38 +83,26 @@ jobs: | |
| name: "Unit test" | ||
| uses: "phpDocumentor/.github/.github/workflows/[email protected]" | ||
| with: | ||
| <<<<<<< HEAD | ||
| composer-root-version: "1.x-dev" | ||
| ======= | ||
| composer-root-version: "2.x-dev" | ||
| php-extensions: "none, ctype, dom, json, mbstring, phar, simplexml, tokenizer, xml, xmlwriter, fileinfo, iconv" | ||
| >>>>>>> bafbb25a (Add iconv to ci) | ||
|
|
||
| functional-tests: | ||
| name: "Functional test" | ||
| uses: "phpDocumentor/.github/.github/workflows/[email protected]" | ||
| needs: "unit-tests" | ||
| with: | ||
| test-suite: "functional" | ||
| <<<<<<< HEAD | ||
| composer-root-version: "1.x-dev" | ||
| ======= | ||
| php-extensions: "none, ctype, dom, json, mbstring, phar, simplexml, tokenizer, xml, xmlwriter, fileinfo, iconv" | ||
| composer-root-version: "2.x-dev" | ||
| >>>>>>> bafbb25a (Add iconv to ci) | ||
|
|
||
| integration-tests: | ||
| name: "integration test" | ||
| uses: "phpDocumentor/.github/.github/workflows/[email protected]" | ||
| needs: "unit-tests" | ||
| with: | ||
| test-suite: "integration" | ||
| <<<<<<< HEAD | ||
| composer-root-version: "1.x-dev" | ||
| ======= | ||
| php-extensions: "none, ctype, dom, json, mbstring, phar, simplexml, tokenizer, xml, xmlwriter, fileinfo, iconv" | ||
| composer-root-version: "2.x-dev" | ||
| >>>>>>> bafbb25a (Add iconv to ci) | ||
|
|
||
| xml-lint: | ||
| runs-on: "ubuntu-latest" | ||
|
|
||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.