Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurício Meneghini Fauth <mauricio@fauth.dev>2022-03-11 19:02:15 +0300
committerMaurício Meneghini Fauth <mauricio@fauth.dev>2022-03-11 19:02:15 +0300
commit2653b2942ba3fea6ce148c28f751c668f68ca581 (patch)
tree1cbf5ff045d56d3b4aec97b33d35acddb055c9e0 /scripts
parent87ea687a3a73f8464a9ad108e7e38e15fd62351d (diff)
parent727fa49fb1c9e61afc89724d28713f72e8130ad5 (diff)
Merge branch 'QA_5_1' into QA_5_2
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/create-release.sh1
-rwxr-xr-xscripts/sync-js-vendor-files.sh4
2 files changed, 3 insertions, 2 deletions
diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index 72ee61a518..12012a74f4 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -188,6 +188,7 @@ cleanup_composer_vendors() {
vendor/twig/twig/.editorconfig \
vendor/twig/twig/.php_cs.dist \
vendor/twig/twig/drupal_test.sh \
+ vendor/twig/twig/.php-cs-fixer.dist.php \
vendor/webmozart/assert/.editorconfig \
vendor/webmozart/assert/.github/ \
vendor/webmozart/assert/.php_cs \
diff --git a/scripts/sync-js-vendor-files.sh b/scripts/sync-js-vendor-files.sh
index a7b4a957e4..5f5a00ceba 100755
--- a/scripts/sync-js-vendor-files.sh
+++ b/scripts/sync-js-vendor-files.sh
@@ -71,11 +71,11 @@ echo 'Updating OpenLayers'
cp ./node_modules/ol/ol.css ./js/vendor/openlayers/theme/ol.css
npx webpack-cli --config ./js/config/ol/webpack.config.js
echo "/*!
- * OpenLayers v$(yarn -s info ol version) (https://openlayers.org/)
+ * OpenLayers v$(yarn info -s ol version) (https://openlayers.org/)
* Copyright 2005-present, OpenLayers Contributors All rights reserved.
* Licensed under BSD 2-Clause License (https://github.com/openlayers/openlayers/blob/main/LICENSE.md)
*
- * @license $(yarn -s info ol license)
+ * @license $(yarn info -s ol license)
*/
$(cat ./js/vendor/openlayers/OpenLayers.js)" > ./js/vendor/openlayers/OpenLayers.js
echo 'Updating sprintf'