Skip to content

Commit 04a39bf

Browse files
authored
Merge pull request #856 from phpDocumentor/prepare-1.0.0
Use branch alias to set version
2 parents 35d7396 + 40a77a7 commit 04a39bf

File tree

11 files changed

+141
-53
lines changed

11 files changed

+141
-53
lines changed

.github/workflows/documentation.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ jobs:
3131
coverage: "none"
3232
php-version: "8.2"
3333

34+
- name: "Set COMPOSER_ROOT_VERSION"
35+
run: |
36+
echo "COMPOSER_ROOT_VERSION=1.x-dev" >> $GITHUB_ENV
37+
3438
- name: "Install dependencies with Composer"
3539
uses: "ramsey/composer-install@v2"
3640
with:

.github/workflows/integrate.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on: # yamllint disable-line rule:truthy
88
branches:
99
- "main"
1010

11+
env:
12+
ComposerRootVersion: "1.x-dev"
13+
1114
jobs:
1215
code-coverage:
1316
name: "Code Coverage"
@@ -49,6 +52,7 @@ jobs:
4952
uses: "phpDocumentor/.github/.github/workflows/[email protected]"
5053
with:
5154
php-version: "8.2"
55+
composer-root-version: "1.x-dev"
5256

5357
architecture:
5458
name: "Check architecture"
@@ -73,20 +77,24 @@ jobs:
7377
unit-tests:
7478
name: "Unit test"
7579
uses: "phpDocumentor/.github/.github/workflows/[email protected]"
80+
with:
81+
composer-root-version: "1.x-dev"
7682

7783
functional-tests:
7884
name: "Functional test"
7985
uses: "phpDocumentor/.github/.github/workflows/[email protected]"
8086
needs: "unit-tests"
8187
with:
8288
test-suite: "functional"
89+
composer-root-version: "1.x-dev"
8390

8491
integration-tests:
8592
name: "integration test"
8693
uses: "phpDocumentor/.github/.github/workflows/[email protected]"
8794
needs: "unit-tests"
8895
with:
8996
test-suite: "integration"
97+
composer-root-version: "1.x-dev"
9098

9199
xml-lint:
92100
runs-on: "ubuntu-latest"

composer.json

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
"php": "^8.1",
3737
"ext-json": "*",
3838
"ext-mbstring": "*",
39-
"phpdocumentor/guides": "self.version",
40-
"phpdocumentor/guides-cli": "self.version",
41-
"phpdocumentor/guides-code": "self.version",
42-
"phpdocumentor/guides-graphs": "self.version",
43-
"phpdocumentor/guides-markdown": "self.version",
44-
"phpdocumentor/guides-restructured-text": "self.version",
45-
"phpdocumentor/guides-theme-bootstrap": "self.version"
39+
"phpdocumentor/guides": "^1.0@dev || ^0.3",
40+
"phpdocumentor/guides-cli": "^1.0@dev || ^0.3",
41+
"phpdocumentor/guides-code": "^1.0@dev || ^0.3",
42+
"phpdocumentor/guides-graphs": "^1.0@dev || ^0.3",
43+
"phpdocumentor/guides-markdown": "^1.0@dev || ^0.3",
44+
"phpdocumentor/guides-restructured-text": "^1.0@dev || ^0.3",
45+
"phpdocumentor/guides-theme-bootstrap": "^1.0@dev || ^0.3"
4646
},
4747
"require-dev": {
4848
"ext-dom": "*",
@@ -76,5 +76,10 @@
7676
"url": "./packages/*",
7777
"type": "path"
7878
}
79-
]
79+
],
80+
"extra": {
81+
"branch-alias": {
82+
"dev-main": "1.x-dev"
83+
}
84+
}
8085
}

composer.lock

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

0 commit comments

Comments
 (0)