Merge pull request #127 from markcheret/release-tweaks

ci: release process tweaks

.github/workflows/release-handler.yml

@@ -14,10 +14,13 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Build Plugin
+      - name: Install dependencies
         run: |
           composer install --no-dev --optimize-autoloader
-          composer run build
+          
+      - name: Build Plugin
+        run: |
+          composer run build -- -y
 
       - name: Create release archive
         uses: montudor/action-zip@v0.1.0

_tools/build-stylesheets.sh

@@ -52,7 +52,6 @@ elif [[ $1 == "-d" ]]; then
 	# with `cp` and disabled the `rm` command, so the minified
 	# files won't be removed from the source directory.
 	echo "Deploying minified stylesheets to \`dist/css/\`..."
-	rm -r ./dist
 	mkdir -p ./dist/css
 	for f in ./css/tmp/*.min.css;	do
 		filename=$(basename $f .css)

_tools/build.sh

@@ -4,13 +4,15 @@ echo "Building Plugin..."
 
 # Moves everything including the style sheets over to `dist/`
 echo "Copying directories..."
+rm -r dist/
+mkdir dist
 cp -r -t dist class/ css/ js/ languages/ templates/
 # Among the images, only 2 out of 3 are distributed.
 echo "Copying the needed images..."
-mkdir dist/img
-cp -t dist/img img/fn-wysiwyg.png img/main-menu.png
+mkdir -p dist/img
+cp -t dist/img img/fn-wysiwyg.png
 echo "Copying files..."
-cp -t dist features.txt license.txt readme.txt includes.php wpml-config.xml customized-documentation-schema.txt customized-template-stack.txt CONTRIBUTING.md README.md SECURITY.md
+cp -t dist license.txt readme.txt includes.php wpml-config.xml SECURITY.md
 echo "Setting production flag..."
 sed "s/'PRODUCTION_ENV', false/'PRODUCTION_ENV', true/g" footnotes.php > dist/footnotes.php
 echo "Production flag set." 
@@ -21,8 +23,10 @@ echo "Production flag set."
 echo "Building stylesheets..."
 ./_tools/build-stylesheets.sh -c
 if [ $? != 0 ]; then echo "Concatenation failed!"; exit 1; fi
-./_tools/build-stylesheets.sh -m
-if [ $? != 0 ]; then echo "Minification failed!"; exit 1; fi
+if [[ $1 != "-y" ]]; then
+	./_tools/build-stylesheets.sh -m
+	if [ $? != 0 ]; then echo "Minification failed!"; exit 1; fi
+fi
 ./_tools/build-stylesheets.sh -d
 if [ $? != 0 ]; then echo "Deployment failed!"; exit 1; fi
 echo "Stylesheet build complete."

_tools/release.sh

@@ -224,8 +224,9 @@ echo "Current version:"
 echo -e '\t' $PRERELEASE_VERSION
 echo "Stable version:"
 echo -e '\t' $STABLE_VERSION '\n'
-echo "Commit message:\n"
+echo -e "Commit message:\n"
 echo -e "$CHANGELOG_MESSAGE" '\n'
+svn status | grep '^\!' | sed 's/! *//' | xargs -I% svn rm %
 echo -e "Changes made to local \`trunk/\`:\n"
 svn stat tmp/trunk/
 echo ""
@@ -237,10 +238,11 @@ read -p "Is this all correct? (Y/N): " CONFIRM && [[ $CONFIRM == [yY] || $CONFIR
 # Step 7(d): Push to remote `trunk/` (provided the flag is set)
 
 if [[ $1 == "-c" ]]; then
-	svn ci -m "$CHANGELOG_MESSAGE"
+	cd tmp && svn ci -m "$CHANGELOG_MESSAGE"
+	cd ..
 else echo "- Commit flag not set, skipping commit step."
 fi
 
 # Step 8: Cleanup
 
-rm -rf {dist/,tmp/}
+#rm -rf {dist/,tmp/}

js/wysiwyg-editor.js

@@ -68,7 +68,7 @@
 				author : 'Mark Cheret',
 				authorurl : 'https://cheret.org/footnotes/',
 				infourl : 'https://wordpress.org/plugins/footnotes/',
-				version : '2.7.0'
+				version : '2.7.1d'
 			};
 		}
 	});

readme.txt

@@ -78,6 +78,9 @@ Visit this swift write-up from a **footnotes** user by the name of **Southwest**
 
 = 2.7.1 =
 - Bugfix: Stylesheets: higher specificity, thanks to @cybermrmotte bug report.
+- Dashboard: move Plugin settings under default WP Settings menu.
+- Bugfix: Footnotes: fix bug when using multiple paragraphs in footnotes.
+- Documentation: remove outdated MCI/ManFisher references
  
 = 2.7.0 =
 - Adding: Reference container: optionally per section by shortcode, thanks to @grflukas issue report.