diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index c62f7d51..b8a6aeed 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -102,5 +102,9 @@ jobs: docker-compose exec -T wordpress wp option patch --allow-root update woocommerce_wootax_settings tc_id ${{ secrets.TAXCLOUD_LOGIN_ID }} docker-compose exec -T wordpress wp option patch --allow-root update woocommerce_wootax_settings tc_key ${{ secrets.TAXCLOUD_API_KEY }} + - name: Update WP database + working-directory: docker + run: docker-compose exec -T wordpress wp core update-db --allow-root + - name: Run cypress tests uses: cypress-io/github-action@v6 diff --git a/changelog.txt b/changelog.txt index abcc710e..866498f8 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,12 @@ Changelog for Simple Sales Tax Format based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). += [8.0.11] - 2024-04-19 = + +Changed: +- Bump tested WP version to 6.5 +- Bump tested WC version to 8.8 + = [8.0.10] - 2024-03-20 = Changed: diff --git a/docker/Dockerfile b/docker/Dockerfile index 437c2409..6ae976c9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -119,8 +119,8 @@ RUN set -eux; \ find /etc/apache2 -type f -name '*.conf' -exec sed -ri 's/([[:space:]]*LogFormat[[:space:]]+"[^"]*)%h([^"]*")/\1%a\2/g' '{}' + RUN set -eux; \ - version='6.4.1'; \ - sha1='35e62d935d6a93097366476e389752dd55d8a077'; \ + version='6.5.2'; \ + sha1='b70701b5426891ca1f8ff9b3cd96653e2b60d7e9'; \ \ curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \ echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \ @@ -166,6 +166,9 @@ RUN curl -O https://raw.githubusercontent.com/WP-API/Basic-Auth/master/basic-aut mkdir /usr/src/wordpress/wp-content/plugins/basic-auth; \ mv basic-auth.php /usr/src/wordpress/wp-content/plugins/basic-auth +# Set up WC_LOG_DIR +RUN mkdir -p /usr/src/wordpress/wp-content/uploads/wc-logs + VOLUME /var/www/html COPY --chown=www-data:www-data wp-config-docker.php /usr/src/wordpress/ diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 84d39f34..9e9b1ae8 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -10,18 +10,22 @@ services: ports: - 8080:80 environment: - - WORDPRESS_DB_HOST=db - - WORDPRESS_DB_USER=exampleuser - - WORDPRESS_DB_PASSWORD=examplepass - - WORDPRESS_DB_NAME=exampledb - - WORDPRESS_AUTH_KEY='nmsKIZSZtzB7QYLZxhiwURTf0WLa55Go5NMihtwv1GBqVKs7l84osCejXx4iyIRPj70v4OD7iYga1TijcT0CLg==' - - WORDPRESS_SECURE_AUTH_KEY='Z1VwJC7fyX/Tk29mDnOtYB37eJh5HVvT1xVadwWqtnlMVM1SJBqKD5RaGU2W3BIEMKbEdMKn3fsYMkvaR3Q3cA==' - - WORDPRESS_LOGGED_IN_KEY='65BcApZO8vx0uL7ZhKK4hJkFjjdr//mlqcuzhqxd2GfUslVKUQNwTE0ko58dQkxwWLh5++4xMiMMarsaQ6YslA==' - - WORDPRESS_NONCE_KEY='2+lN58w1Yv0WbU9MZ+TlW1SkCDfj0c0/Byzq+cmBCdrebSRwyRPlictc47njeHpcDkm25ZbTI/8/hYog+VoWbA==' - - WORDPRESS_AUTH_SALT='GqiNMWWmy+LWU3i13vs5OoqzqIYOHxQNppjjoDElxe7d/PzOiSQLNxItQsym9W90cRromhrQ5DBEYg1W5eCu/g==' - - WORDPRESS_SECURE_AUTH_SALT='2f4YwX/djvr4Fl5sh9crq4ic5lm5pnpvTyqiiPzNtqJoH5g0kr9SFTVAH5mKbTzb0EdVsdorSPI+Ys/frbM05Q==' - - WORDPRESS_LOGGED_IN_SALT='1yS8rztjey5nqQmPG+p25E3yULuJY6Jrr+tQrkLvw6MICNX+Vq6upm2rBN8pTuuTgNwStcBBwFc9I6nv2bLNxg==' - - WORDPRESS_NONCE_SALT='NXSbOHc97HVmm3m3MrEb5xsTlhPifWfRYu7+u43W/r2XWQTevVMebq4xbpPG1YZMiD9dRmmPySGyWcsyOPgnAw==' + WORDPRESS_DB_HOST: db + WORDPRESS_DB_USER: exampleuser + WORDPRESS_DB_PASSWORD: examplepass + WORDPRESS_DB_NAME: exampledb + WORDPRESS_AUTH_KEY: 'nmsKIZSZtzB7QYLZxhiwURTf0WLa55Go5NMihtwv1GBqVKs7l84osCejXx4iyIRPj70v4OD7iYga1TijcT0CLg==' + WORDPRESS_SECURE_AUTH_KEY: 'Z1VwJC7fyX/Tk29mDnOtYB37eJh5HVvT1xVadwWqtnlMVM1SJBqKD5RaGU2W3BIEMKbEdMKn3fsYMkvaR3Q3cA==' + WORDPRESS_LOGGED_IN_KEY: '65BcApZO8vx0uL7ZhKK4hJkFjjdr//mlqcuzhqxd2GfUslVKUQNwTE0ko58dQkxwWLh5++4xMiMMarsaQ6YslA==' + WORDPRESS_NONCE_KEY: '2+lN58w1Yv0WbU9MZ+TlW1SkCDfj0c0/Byzq+cmBCdrebSRwyRPlictc47njeHpcDkm25ZbTI/8/hYog+VoWbA==' + WORDPRESS_AUTH_SALT: 'GqiNMWWmy+LWU3i13vs5OoqzqIYOHxQNppjjoDElxe7d/PzOiSQLNxItQsym9W90cRromhrQ5DBEYg1W5eCu/g==' + WORDPRESS_SECURE_AUTH_SALT: '2f4YwX/djvr4Fl5sh9crq4ic5lm5pnpvTyqiiPzNtqJoH5g0kr9SFTVAH5mKbTzb0EdVsdorSPI+Ys/frbM05Q==' + WORDPRESS_LOGGED_IN_SALT: '1yS8rztjey5nqQmPG+p25E3yULuJY6Jrr+tQrkLvw6MICNX+Vq6upm2rBN8pTuuTgNwStcBBwFc9I6nv2bLNxg==' + WORDPRESS_NONCE_SALT: 'NXSbOHc97HVmm3m3MrEb5xsTlhPifWfRYu7+u43W/r2XWQTevVMebq4xbpPG1YZMiD9dRmmPySGyWcsyOPgnAw==' + WORDPRESS_CONFIG_EXTRA: | + // WC is throwing an error when attempting to create the log dir. + // We create it ourselves in Dockerfile to avoid that. + define('WC_LOG_DIR', '/var/www/html/wp-content/uploads/wc-logs'); volumes: - wordpress:/var/www/html - ./plugin:/var/www/html/wp-content/plugins/simple-sales-tax diff --git a/includes/class-simplesalestax.php b/includes/class-simplesalestax.php index 8763a1f9..aaade962 100644 --- a/includes/class-simplesalestax.php +++ b/includes/class-simplesalestax.php @@ -20,7 +20,7 @@ final class SimpleSalesTax { * * @var string */ - public $version = '8.0.10'; + public $version = '8.0.11'; /** * The singleton plugin instance. diff --git a/languages/simple-sales-tax.pot b/languages/simple-sales-tax.pot index 50728e12..976c2d93 100644 --- a/languages/simple-sales-tax.pot +++ b/languages/simple-sales-tax.pot @@ -2,9 +2,9 @@ # This file is distributed under the same license as the Simple Sales Tax package. msgid "" msgstr "" -"Project-Id-Version: Simple Sales Tax 8.0.10\n" +"Project-Id-Version: Simple Sales Tax 8.0.11\n" "Report-Msgid-Bugs-To: https://github.com/bporcelli/simplesalestax/issues\n" -"POT-Creation-Date: 2024-03-20 15:33:15+00:00\n" +"POT-Creation-Date: 2024-04-19 15:28:49+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/package-lock.json b/package-lock.json index effba2c9..2529b253 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "simplesalestax", - "version": "8.0.10", + "version": "8.0.11", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/package.json b/package.json index 1d2e7dfd..fd37a72d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "simplesalestax", - "version": "8.0.10", + "version": "8.0.11", "description": "A TaxCloud integration for WooCommerce.", "scripts": { "build": "grunt", diff --git a/readme.txt b/readme.txt index 2a1f7fbd..2f34eca7 100644 --- a/readme.txt +++ b/readme.txt @@ -2,8 +2,8 @@ Contributors: taxcloud, bporcelli Tags: woocommerce, taxcloud, tax, taxes, sales tax, tax calculation, sales tax compliance, sales tax filing, sales tax reporting Requires at least: 4.5 -Tested up to: 6.4 -Stable tag: 8.0.10 +Tested up to: 6.5 +Stable tag: 8.0.11 Requires PHP: 7.4 License: GPLv2 or later License URI: https://www.gnu.org/licenses/gpl-2.0.html diff --git a/simple-sales-tax.php b/simple-sales-tax.php index bfcae29d..0f0ff304 100644 --- a/simple-sales-tax.php +++ b/simple-sales-tax.php @@ -6,14 +6,14 @@ * Author: TaxCloud * Author URI: https://taxcloud.com * GitHub Plugin URI: https://github.com/bporcelli/simplesalestax - * Version: 8.0.10 + * Version: 8.0.11 * Text Domain: simple-sales-tax * Domain Path: /languages/ * * Requires at least: 4.5.0 - * Tested up to: 6.4.0 + * Tested up to: 6.5.0 * WC requires at least: 6.9.0 - * WC tested up to: 8.7.0 + * WC tested up to: 8.8.2 * * @category Plugin * @copyright Copyright © 2024 The Federal Tax Authority, LLC