resolve merge issue
This commit is contained in:
parent
168dee0259
commit
031367fb2c
@ -24,15 +24,4 @@ jobs:
|
|||||||
|
|
||||||
- name: Update Composer Packages
|
- name: Update Composer Packages
|
||||||
working-directory: ${{ var.PROD_DEPLOY_DIR }}
|
working-directory: ${{ var.PROD_DEPLOY_DIR }}
|
||||||
<<<<<<< HEAD
|
|
||||||
run: composer update
|
|
||||||
|
|
||||||
- name: Refresh Site Cache
|
|
||||||
working-directory: ${{ var.PROD_DEPLOY_DIR }}
|
|
||||||
run: |
|
|
||||||
php bin/console cache:clear
|
|
||||||
php bin/console cache:pool:prune
|
|
||||||
php bin/console cache:warmup
|
|
||||||
=======
|
|
||||||
run: composer update --no-interaction --working-dir=${{ var.PROD_DEPLOY_DIR }}
|
run: composer update --no-interaction --working-dir=${{ var.PROD_DEPLOY_DIR }}
|
||||||
>>>>>>> d172aec (remove redundant cache refresh)
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user