EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Björn Fromme
2022-10-04 17:32:46 +02:00
parent cd4704b55b 29ab253484
commit e799497e73
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/deploy.yaml
+5 -4
View File
@@ -4,6 +4,8 @@ on:
push: push:
branches: [ master ] branches: [ master ]
concurrency: production_environment
jobs: jobs:
build: build:
name: Build assets and deploy name: Build assets and deploy
@@ -42,8 +44,7 @@ jobs:
- run: npm run build - run: npm run build
- name: Deploy - name: Deploy
uses: musps/action-deployer-php@master uses: deployphp/action@v1
with: with:
args: deploy production private-key: ${{ secrets.SSH_PRIVATE_KEY }}
env: dep: deploy production
SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
composer.json
+1 -1
View File
@@ -77,7 +77,7 @@
} }
}, },
"require-dev": { "require-dev": {
"deployer/deployer": "^7", "deployer/deployer": "^v7.0",
"ichhabrecht/filefill": "^3.3", "ichhabrecht/filefill": "^3.3",
"typo3/testing-framework": "^6.16" "typo3/testing-framework": "^6.16"
}, },
deploy.php
+3 -1
View File
@@ -64,6 +64,7 @@ host('production')
->set('buspronet_path', '/home/www/p546128/html/kuschick/buspronet/buspronet') ->set('buspronet_path', '/home/www/p546128/html/kuschick/buspronet/buspronet')
->set('bin/php', '/usr/local/bin/php') ->set('bin/php', '/usr/local/bin/php')
->set('http_user', 'p546128') ->set('http_user', 'p546128')
->set('writable_mode', 'chmod')
->set('bin/composer', '/usr/local/bin/composer') ->set('bin/composer', '/usr/local/bin/composer')
->set('composer_options', '--prefer-dist --no-progress --no-interaction --optimize-autoloader') ->set('composer_options', '--prefer-dist --no-progress --no-interaction --optimize-autoloader')
->set('rsync_src', __DIR__) ->set('rsync_src', __DIR__)
@@ -83,6 +84,7 @@ host('staging')
->set('buspronet_path', '/home/www/p546128/html/kuschick/buspronet/buspronet') ->set('buspronet_path', '/home/www/p546128/html/kuschick/buspronet/buspronet')
->set('bin/php', '/usr/local/bin/php') ->set('bin/php', '/usr/local/bin/php')
->set('http_user', 'p546128') ->set('http_user', 'p546128')
->set('writable_mode', 'chmod')
->set('bin/composer', '/usr/local/bin/composer') ->set('bin/composer', '/usr/local/bin/composer')
->set('composer_options', '--prefer-dist --no-progress --no-interaction --optimize-autoloader') ->set('composer_options', '--prefer-dist --no-progress --no-interaction --optimize-autoloader')
->set('rsync_src', __DIR__) ->set('rsync_src', __DIR__)
@@ -93,7 +95,7 @@ host('staging')
task('deploy', [ task('deploy', [
'deploy:info', 'deploy:info',
'deploy:prepare', 'deploy:setup',
'deploy:lock', 'deploy:lock',
'deploy:release', 'deploy:release',
'rsync', 'rsync',