change to release for OXID 7.x

This commit is contained in:
Daniel Seifert 2024-10-25 11:17:56 +02:00
parent 74f27c816b
commit aa50e4b7b6
2 changed files with 3 additions and 3 deletions

View File

@ -12,7 +12,7 @@ Install Composer.
Clone the repository into a separate directory (`deployer` for example) on your server and checkout this branch. Clone the repository into a separate directory (`deployer` for example) on your server and checkout this branch.
Run `composer install`. Run `composer install` in it.
Add an alias for the deployer command: `alias dep='/usr/local/php8.2/bin/php /home/XXX/deployer/vendor/bin/dep'`. Load the changed configuration. Add an alias for the deployer command: `alias dep='/usr/local/php8.2/bin/php /home/XXX/deployer/vendor/bin/dep'`. Load the changed configuration.

View File

@ -4,7 +4,7 @@
- checkout the customer repository - checkout the customer repository
- `git remote add deployment gitfhfac@git.d3data.de:D3Private/deployerRecipes.git && git remote set-url --push deployment DONTPUSH` - `git remote add deployment gitfhfac@git.d3data.de:D3Private/deployerRecipes.git && git remote set-url --push deployment DONTPUSH`
- `git fetch deployment` - `git fetch deployment`
- `git switch -c deployment deployment/[template branch]` - `git switch -c deployment deployment/rel_OXID_7.x`
checkout remote branch and rename it to `deployment` checkout remote branch and rename it to `deployment`
- `git push origin deployment` - `git push origin deployment`
- `git remote rm deployment` - `git remote rm deployment`
@ -14,6 +14,6 @@
- `git checkout deployment && git pull origin deployment` - `git checkout deployment && git pull origin deployment`
- `git remote add deployment gitfhfac@git.d3data.de:D3Private/deployerRecipes.git && git remote set-url --push deployment DONTPUSH` - `git remote add deployment gitfhfac@git.d3data.de:D3Private/deployerRecipes.git && git remote set-url --push deployment DONTPUSH`
- `git fetch deployment` - `git fetch deployment`
- `git merge deployment/[template branch]` - `git merge deployment/rel_OXID_7.x`
- `git push origin deployment` - `git push origin deployment`
- `git remote rm deployment` - `git remote rm deployment`