Merge branch 'feature/3646-fix-actions' into feature/3642-reenqueue-j…

…query

.github/workflows/cypress.yml

@@ -4,11 +4,16 @@ on: [pull_request]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: '12'
+    - uses: nanasess/setup-php@master
+      with:
+        php-version: '7.4'
 
     - name: Validate composer.json and composer.lock
       run: composer validate

.github/workflows/js.yml

@@ -4,11 +4,16 @@ on: [pull_request]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: '12'
+    - uses: nanasess/setup-php@master
+      with:
+        php-version: '7.4'
 
     - name: Validate composer.json and composer.lock
       run: composer validate

.github/workflows/php.yml

@@ -4,11 +4,16 @@ on: [pull_request]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: '12'
+    - uses: nanasess/setup-php@master
+      with:
+        php-version: '7.4'
 
     - name: Validate composer.json and composer.lock
       run: composer validate

.github/workflows/zip.yml

@@ -8,8 +8,15 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '12'
+      - uses: nanasess/setup-php@master
+        with:
+          php-version: '7.4'
 
       - name: Install PHP dependencies, optimized
         run: composer install --no-dev -o

bin/install-docker.sh

@@ -45,9 +45,9 @@ echo ''
 
 # Install WordPress
 echo -e $(status_message "Installing WordPress...")
-docker-compose run --rm -u 33 cli core install --url=localhost:$HOST_PORT --title=TestSite --admin_user=admin --admin_password=password [email protected] >/dev/null
+docker-compose run --rm -u 33 cli wp core install --url=localhost:$HOST_PORT --title=TestSite --admin_user=admin --admin_password=password [email protected] >/dev/null
 # Check for WordPress updates, just in case the WordPress image isn't up to date.
-docker-compose run --rm -u 33 cli core update >/dev/null
+docker-compose run --rm -u 33 cli wp core update >/dev/null
 
 # If the 'wordpress' volume wasn't during the down/up earlier, but the post port has changed, we need to update it.
 CURRENT_URL=$(docker-compose run -T --rm cli option get siteurl)
@@ -66,6 +66,3 @@ docker-compose run --rm composer install
 echo -e $(status_message "Installing PHPUnit test scaffolding...")
 docker-compose run --rm wordpress_phpunit bash $(dirname "$0")/install-wp-tests.sh wordpress_test root example mysql "${WP_VERSION}" false >/dev/null
 echo -e $(status_message "Completed installing tests")
-
-
-

bin/install-wp-tests.sh

@@ -20,7 +20,7 @@ WP_CORE_DIR=${WP_CORE_DIR-/tmp/wordpress/}
 
 if [[ $WP_VERSION =~ [0-9]+\.[0-9]+(\.[0-9]+)? ]]; then
 	WP_TESTS_TAG="tags/$WP_VERSION"
-elif [[ $WP_VERSION == 'nightly' || $WP_VERSION == 'trunk' ]]; then
+elif [[ $WP_VERSION == 'nightly' || $WP_VERSION == 'trunk' ]] ; then
 	WP_TESTS_TAG="trunk"
 else
 	# http serves a single offer, whereas https serves multiple. we only want one
@@ -44,7 +44,7 @@ install_wp() {
 
 	mkdir -p $WP_CORE_DIR
 
-	if [[ $WP_VERSION == 'nightly' || $WP_VERSION == 'trunk' ]]; then
+	if [[ $WP_VERSION == 'nightly' || $WP_VERSION == 'trunk' ]] ; then
 		mkdir -p /tmp/wordpress-nightly
 		download https://wordpress.org/nightly-builds/wordpress-latest.zip  /tmp/wordpress-nightly/wordpress-nightly.zip
 		unzip -q /tmp/wordpress-nightly/wordpress-nightly.zip -d /tmp/wordpress-nightly/
@@ -93,7 +93,7 @@ install_test_suite() {
 
 install_db() {
 
-	if [ ${SKIP_DB_CREATE} = "true" ]; then
+	if [ ${SKIP_DB_CREATE} = "true" ] ; then
 		return 0
 	fi
 
@@ -104,7 +104,7 @@ install_db() {
 	local EXTRA=""
 
 	if ! [ -z $DB_HOSTNAME ] ; then
-		if [ $(echo $DB_SOCK_OR_PORT | grep -e '^[0-9]\{1,\}$') ]; then
+		if [ $(echo $DB_SOCK_OR_PORT | grep -e '^[0-9]\{1,\}$') ] ; then
 			EXTRA=" --host=$DB_HOSTNAME --port=$DB_SOCK_OR_PORT --protocol=tcp"
 		elif ! [ -z $DB_SOCK_OR_PORT ] ; then
 			EXTRA=" --socket=$DB_SOCK_OR_PORT"

bin/setup-test-forms.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-docker-compose run --rm cli  wp cf import-test-forms
-docker-compose run --rm cli  wp cf create-test-pages
+docker-compose run --rm cli wp cf import-test-forms
+docker-compose run --rm cli wp cf create-test-pages

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "caldera-forms",
-	"version": "1.9.3-b1",
+	"version": "1.9.3-b2",
 	"description": "Apex WordPress Forms",
 	"main": "Gruntfile.js",
 	"repository": {