diff --git a/Build/Jenkins/update-neos-ui-compiled.sh b/Build/Jenkins/update-neos-ui-compiled.sh index 406575bccd..0fae0482e1 100755 --- a/Build/Jenkins/update-neos-ui-compiled.sh +++ b/Build/Jenkins/update-neos-ui-compiled.sh @@ -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 diff --git a/README.md b/README.md index eb5ba8f312..26813631f9 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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` ``` diff --git a/Tests/IntegrationTests/TestDistribution/DistributionPackages/Neos.TestSite/composer.json b/Tests/IntegrationTests/TestDistribution/DistributionPackages/Neos.TestSite/composer.json index 6b391192c8..72280a6a75 100644 --- a/Tests/IntegrationTests/TestDistribution/DistributionPackages/Neos.TestSite/composer.json +++ b/Tests/IntegrationTests/TestDistribution/DistributionPackages/Neos.TestSite/composer.json @@ -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": "*" }, diff --git a/Tests/IntegrationTests/TestDistribution/composer.json b/Tests/IntegrationTests/TestDistribution/composer.json index 6949b857e3..a086af0040 100644 --- a/Tests/IntegrationTests/TestDistribution/composer.json +++ b/Tests/IntegrationTests/TestDistribution/composer.json @@ -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" diff --git a/composer.json b/composer.json index 1bb830a552..2f338636b8 100644 --- a/composer.json +++ b/composer.json @@ -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": {