From 401ecbdfbed89553b2e9e5a87f60dcf66f2eaca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 19 Dec 2016 14:02:16 +0100 Subject: [PATCH 1/6] Remove not used option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We use 7z for creating zips for ages, this code was not used for years. Signed-off-by: Michal Čihař --- scripts/create-release.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 874a81e8aa..2dba9ec4c3 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -310,10 +310,6 @@ for kit in $KITS ; do gzip -9c $name.tar > $name.tar.gz fi ;; - zip) - echo "* Creating $name.zip" - zip -q -9 -r $name.zip $name - ;; zip-7z) echo "* Creating $name.zip" 7za a -bd -tzip $name.zip $name > /dev/null From b6b3adf08e694784074a4341adb6fc20fead3bc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 19 Dec 2016 14:04:08 +0100 Subject: [PATCH 2/6] Remove .tar.bz2 release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's almost not downloaded and people usually can choose xz instead which does compress better. See https://github.com/phpmyadmin/phpmyadmin/issues/12348 Signed-off-by: Michal Čihař --- scripts/create-release.sh | 10 +++------- scripts/upload-release | 8 -------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 2dba9ec4c3..e65fa4190a 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -18,7 +18,7 @@ set -u set -e KITS="all-languages english" -COMPRESSIONS="zip-7z tbz txz tgz 7z" +COMPRESSIONS="zip-7z txz tgz 7z" # Process parameters @@ -297,10 +297,6 @@ for kit in $KITS ; do echo "* Creating $name.tar" tar --owner=root --group=root --numeric-owner --sort=name -cf $name.tar $name fi - if [ $comp = tbz ] ; then - echo "* Creating $name.tar.bz2" - bzip2 -9k $name.tar - fi if [ $comp = txz ] ; then echo "* Creating $name.tar.xz" xz -9k $name.tar @@ -337,7 +333,7 @@ git worktree prune # Signing of files with default GPG key echo "* Signing files" -for file in *.gz *.zip *.xz *.bz2 *.7z ; do +for file in *.gz *.zip *.xz *.7z ; do gpg --detach-sign --armor $file sha1sum $file > $file.sha1 sha256sum $file > $file.sha256 @@ -350,7 +346,7 @@ echo "" echo "Files:" echo "------" -ls -la *.gz *.zip *.xz *.bz2 *.7z +ls -la *.gz *.zip *.xz *.7z cd .. diff --git a/scripts/upload-release b/scripts/upload-release index c1588616f7..9d2553034a 100755 --- a/scripts/upload-release +++ b/scripts/upload-release @@ -29,8 +29,6 @@ cat > $BATCH < Date: Mon, 19 Dec 2016 14:05:37 +0100 Subject: [PATCH 3/6] Remove 7z download option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It does compress worse than tar.xz and experienced users won't have problems using either of these. See https://github.com/phpmyadmin/phpmyadmin/issues/12348 Signed-off-by: Michal Čihař --- scripts/create-release.sh | 10 +++------- scripts/upload-release | 8 -------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index e65fa4190a..5f67b7216d 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -18,7 +18,7 @@ set -u set -e KITS="all-languages english" -COMPRESSIONS="zip-7z txz tgz 7z" +COMPRESSIONS="zip-7z txz tgz" # Process parameters @@ -310,10 +310,6 @@ for kit in $KITS ; do echo "* Creating $name.zip" 7za a -bd -tzip $name.zip $name > /dev/null ;; - 7z) - echo "* Creating $name.7z" - 7za a -bd $name.7z $name > /dev/null - ;; *) echo "WARNING: ignoring compression '$comp', not known!" ;; @@ -333,7 +329,7 @@ git worktree prune # Signing of files with default GPG key echo "* Signing files" -for file in *.gz *.zip *.xz *.7z ; do +for file in *.gz *.zip *.xz ; do gpg --detach-sign --armor $file sha1sum $file > $file.sha1 sha256sum $file > $file.sha256 @@ -346,7 +342,7 @@ echo "" echo "Files:" echo "------" -ls -la *.gz *.zip *.xz *.7z +ls -la *.gz *.zip *.xz cd .. diff --git a/scripts/upload-release b/scripts/upload-release index 9d2553034a..34472b7442 100755 --- a/scripts/upload-release +++ b/scripts/upload-release @@ -35,32 +35,24 @@ put phpMyAdmin-$REL-all-languages.tar.gz put phpMyAdmin-$REL-english.tar.gz put phpMyAdmin-$REL-all-languages.zip put phpMyAdmin-$REL-english.zip -put phpMyAdmin-$REL-all-languages.7z -put phpMyAdmin-$REL-english.7z put phpMyAdmin-$REL-all-languages.tar.xz.asc put phpMyAdmin-$REL-english.tar.xz.asc put phpMyAdmin-$REL-all-languages.tar.gz.asc put phpMyAdmin-$REL-english.tar.gz.asc put phpMyAdmin-$REL-all-languages.zip.asc put phpMyAdmin-$REL-english.zip.asc -put phpMyAdmin-$REL-all-languages.7z.asc -put phpMyAdmin-$REL-english.7z.asc put phpMyAdmin-$REL-all-languages.tar.xz.sha256 put phpMyAdmin-$REL-english.tar.xz.sha256 put phpMyAdmin-$REL-all-languages.tar.gz.sha256 put phpMyAdmin-$REL-english.tar.gz.sha256 put phpMyAdmin-$REL-all-languages.zip.sha256 put phpMyAdmin-$REL-english.zip.sha256 -put phpMyAdmin-$REL-all-languages.7z.sha256 -put phpMyAdmin-$REL-english.7z.sha256 put phpMyAdmin-$REL-all-languages.tar.xz.sha1 put phpMyAdmin-$REL-english.tar.xz.sha1 put phpMyAdmin-$REL-all-languages.tar.gz.sha1 put phpMyAdmin-$REL-english.tar.gz.sha1 put phpMyAdmin-$REL-all-languages.zip.sha1 put phpMyAdmin-$REL-english.zip.sha1 -put phpMyAdmin-$REL-all-languages.7z.sha1 -put phpMyAdmin-$REL-english.7z.sha1 put phpMyAdmin-$REL-notes.html EOT From 0e5cf50467a4e4fbba0c30508dc2b6f1496e3c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 19 Dec 2016 14:21:53 +0100 Subject: [PATCH 4/6] Add source release support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See #12348 Signed-off-by: Michal Čihař --- scripts/create-release.sh | 24 ++++++++++++++++++++---- scripts/lang-cleanup.sh | 3 ++- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 5f67b7216d..10bc8db837 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -17,7 +17,7 @@ set -u # Fail on failure set -e -KITS="all-languages english" +KITS="all-languages english source" COMPRESSIONS="zip-7z txz tgz" # Process parameters @@ -183,8 +183,6 @@ if [ -d po ] ; then echo "* Removing incomplete translations" ./scripts/remove-incomplete-mo fi - echo "* Removing gettext source files" - rm -rf po fi if [ -f ./scripts/line-counts.sh ] ; then @@ -279,7 +277,25 @@ for kit in $KITS ; do # Cleanup translations cd phpMyAdmin-$version-$kit - scripts/lang-cleanup.sh $kit + ./scripts/lang-cleanup.sh $kit + + # Remove tests, source code,... + if [ $kit != source ] ; then + echo "* Removing source files" + # Testsuite + rm -rf test/ + rm phpunit.xml.* build.xml + # Gettext po files + rm -rf po/ + # Documentation source code + mv doc/html htmldoc + rm -rf doc + mkdir doc + mv htmldoc doc/html + rm doc/html/.buildinfo doc/html/objects.inv + # Javascript sources + rm -rf js/jquery/src/ js/openlayers/src/ + fi # Remove developer scripts rm -rf scripts diff --git a/scripts/lang-cleanup.sh b/scripts/lang-cleanup.sh index 846dffc87e..e40ce282b1 100755 --- a/scripts/lang-cleanup.sh +++ b/scripts/lang-cleanup.sh @@ -14,6 +14,7 @@ if [ $# -lt 1 ] ; then echo "Usage: lang-cleanup.sh type" echo "Type can be one of:" echo " all-languages - nothing will be done" + echo " source - nothing will be done" echo " english - no translations will be kept" echo " langcode - keeps language" echo @@ -25,7 +26,7 @@ fi match="" for type in "$@" ; do case $type in - all-languages) + all-languages|source) exit 0 ;; english) From b567783a241d3790cf54c00ef19f43c7c4aa0b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 19 Dec 2016 14:33:08 +0100 Subject: [PATCH 5/6] Remove codecov.yml on release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- scripts/create-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 10bc8db837..9fb1fdc409 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -199,7 +199,7 @@ rm -rf .github rm -rf PMAStandard # Testsuite setup -rm -f .travis.yml .coveralls.yml .scrutinizer.yml .jshintrc .weblate +rm -f .travis.yml .coveralls.yml .scrutinizer.yml .jshintrc .weblate codecov.yml # Remove readme for github rm -f README.rst From b0eb82839baf2294eccf61e44ff03ce87e234d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 19 Dec 2016 14:43:09 +0100 Subject: [PATCH 6/6] Add source to upload release script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- scripts/upload-release | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/upload-release b/scripts/upload-release index 34472b7442..e45bad0be8 100755 --- a/scripts/upload-release +++ b/scripts/upload-release @@ -54,6 +54,10 @@ put phpMyAdmin-$REL-english.tar.gz.sha1 put phpMyAdmin-$REL-all-languages.zip.sha1 put phpMyAdmin-$REL-english.zip.sha1 put phpMyAdmin-$REL-notes.html +put phpMyAdmin-$REL-source.tar.xz +put phpMyAdmin-$REL-source.tar.xz.asc +put phpMyAdmin-$REL-source.tar.xz.sha256 +put phpMyAdmin-$REL-source.tar.xz.sha1 EOT # Upload to our file server