Skip to content

Commit

Permalink
Merge branch 'preprod' of github.com:CCSDForge/episciences into preprod
Browse files Browse the repository at this point in the history
  • Loading branch information
devletech committed Sep 13, 2024
2 parents 20f3364 + 15fe668 commit 080ff75
Show file tree
Hide file tree
Showing 7 changed files with 1,766 additions and 2,306 deletions.
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,8 @@ restart-php: ## Restart PHP-FPM Container
$(DOCKER_COMPOSE) restart $(CNTR_NAME_PHP)

merge-pdf-volume: ## merge all pdf from a vid into one pdf
$(DOCKER_COMPOSE) exec -u $(CNTR_APP_USER) -w $(CNTR_APP_DIR) $(CNTR_NAME_PHP) php scripts/mergePdfVol.php --rvcode=$(rvcode) --ignorecache=$(or $(ignorecache),0) --removecache=$(or $(removecache),0)
$(DOCKER_COMPOSE) exec -u $(CNTR_APP_USER) -w $(CNTR_APP_DIR) $(CNTR_NAME_PHP) php scripts/mergePdfVol.php --rvcode=$(rvcode) --ignorecache=$(or $(ignorecache),0) --removecache=$(or $(removecache),0)


can-i-use-update: ## To be launched when Browserslist: caniuse-lite is outdated.
npx update-browserslist-db@latest
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"squizlabs/php_codesniffer": "3.*",
"roave/security-advisories": "dev-latest",
"phpmetrics/phpmetrics": "^2.7",
"rector/rector": "^0.13.10",
"rector/rector": "^1.0.0",
"phpstan/phpstan": "^1.8",
"symfony/test-pack": "^1.0"
},
Expand Down
37 changes: 18 additions & 19 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 080ff75

Please sign in to comment.