Skip to content

Commit

Permalink
TASK: Prepare README and build tools for neos 7.3 release
Browse files Browse the repository at this point in the history
* Updates jenkins script and add the version
* Updates commands in README
* Updates versions in Test Distributions
* Updates composer.json constraint
  • Loading branch information
markusguenther committed Nov 22, 2021
1 parent 82716d3 commit d367d0c
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Build/Jenkins/update-neos-ui-compiled.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ cd tmp_compiled_pkg
git add Resources/Public/
git commit -m "Compile Neos UI - $GIT_SHA1" || true

if [[ "$GIT_BRANCH" == "origin/master" || "$GIT_BRANCH" == "origin/4.0" || "$GIT_BRANCH" == "origin/5.0" || "$GIT_BRANCH" == "origin/5.1" || "$GIT_BRANCH" == "origin/5.2" || "$GIT_BRANCH" == "origin/5.3" || "$GIT_BRANCH" == "origin/7.0" || "$GIT_BRANCH" == "origin/7.1" || "$GIT_BRANCH" == "origin/7.2" ]]; then
if [[ "$GIT_BRANCH" == "origin/master" || "$GIT_BRANCH" == "origin/4.0" || "$GIT_BRANCH" == "origin/5.0" || "$GIT_BRANCH" == "origin/5.1" || "$GIT_BRANCH" == "origin/5.2" || "$GIT_BRANCH" == "origin/5.3" || "$GIT_BRANCH" == "origin/7.0" || "$GIT_BRANCH" == "origin/7.1" || "$GIT_BRANCH" == "origin/7.2" || "$GIT_BRANCH" == "origin/7.3" ]]; then
echo "Git branch $GIT_BRANCH found, pushing to this branch."
git push origin HEAD:${GIT_BRANCH#*/}
fi
Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ That means:
* NeosCMS version 7.0: branch 7.0
* NeosCMS version 7.1: branch 7.1
* NeosCMS version 7.2: branch 7.2
* NeosCMS version 7.3: branch 7.3
* latest development happens in master

## Browser support
Expand Down Expand Up @@ -134,7 +135,9 @@ git checkout 7.1 && git fetch && git reset --hard origin/7.1 && git merge --no-f
# review and `git commit`
git checkout 7.2 && git fetch && git reset --hard origin/7.2 && git merge --no-ff --no-commit origin/7.1
# review and `git commit`
git checkout master && git fetch && git reset --hard origin/master && git merge --no-ff --no-commit origin/7.2
git checkout 7.3 && git fetch && git reset --hard origin/7.3 && git merge --no-ff --no-commit origin/7.2
# review and `git commit`
git checkout master && git fetch && git reset --hard origin/master && git merge --no-ff --no-commit origin/7.3
# review and `git commit`
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "A dummy site package that will be replaced by fixtures during tests",
"type": "neos-site",
"require": {
"neos/neos": "*",
"neos/neos": "~7.3.0 || dev-master",
"neos/neos-ui": "*",
"neos/fusion-afx": "*"
},
Expand Down
2 changes: 1 addition & 1 deletion Tests/IntegrationTests/TestDistribution/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"minimum-stability": "dev",
"require": {
"neos/neos-ui": "dev-master",
"neos/neos-ui": "~7.3.0",
"neos/fusion-afx": "*",
"neos/test-site": "@dev",
"neos/test-nodetypes": "@dev"
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"GPL-3.0-or-later"
],
"require": {
"neos/neos": "^7.2.0 || dev-master",
"neos/neos": "^7.3.0 || dev-master",
"neos/neos-ui-compiled": "self.version"
},
"autoload": {
Expand Down

0 comments on commit d367d0c

Please sign in to comment.