From aa50e4b7b6169d6dca67b46a89317d2a5d3b99b5 Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Fri, 25 Oct 2024 11:17:56 +0200 Subject: [PATCH] change to release for OXID 7.x --- README.md | 2 +- provisioning.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5d65caf..c347d8e 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Install Composer. 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. diff --git a/provisioning.md b/provisioning.md index 3bd48f0..a3fd002 100644 --- a/provisioning.md +++ b/provisioning.md @@ -4,7 +4,7 @@ - checkout the customer repository - `git remote add deployment gitfhfac@git.d3data.de:D3Private/deployerRecipes.git && git remote set-url --push deployment DONTPUSH` - `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` - `git push origin deployment` - `git remote rm deployment` @@ -14,6 +14,6 @@ - `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 fetch deployment` -- `git merge deployment/[template branch]` +- `git merge deployment/rel_OXID_7.x` - `git push origin deployment` - `git remote rm deployment` \ No newline at end of file