Skip to content

Commit 2c629f2

Browse files
authored
Merge branch 'trunk' into wooship-1404-zip-code-does-not-match-the-selected-state
2 parents bff8dae + 9db3608 commit 2c629f2

6 files changed

Lines changed: 29 additions & 15 deletions

File tree

.github/workflows/update-requires-headers.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,15 @@ jobs:
6363
MINOR_VERSION=$(echo "$LATEST_RELEASE" | grep -oE '^[0-9]+\.[0-9]+' | cut -d. -f2)
6464
ADJUSTED_MINOR_VERSION=$((MINOR_VERSION - 2))
6565
66-
if [ "$ADJUSTED_MINOR_VERSION" -lt 0 ]; then
67-
ADJUSTED_MINOR_VERSION=0
66+
if [ "$MINOR_VERSION" -eq 0 ]; then
67+
ADJUSTED_MAJOR_VERSION=$((MAJOR_VERSION - 1))
68+
ADJUSTED_MINOR_VERSION=8
69+
else
70+
ADJUSTED_MAJOR_VERSION=$MAJOR_VERSION
71+
ADJUSTED_MINOR_VERSION=$((MINOR_VERSION - 2))
6872
fi
6973
70-
LATEST_MINOR_RELEASE="$MAJOR_VERSION.$ADJUSTED_MINOR_VERSION"
74+
LATEST_MINOR_RELEASE="$ADJUSTED_MAJOR_VERSION.$ADJUSTED_MINOR_VERSION"
7175
7276
echo "Latest WooCommerce Release: $LATEST_RELEASE"
7377
echo "LATEST_RELEASE=$LATEST_RELEASE" >> $GITHUB_ENV
@@ -91,7 +95,7 @@ jobs:
9195
# Get required versions from WooCommerce core
9296
REQUIRES_AT_LEAST=$(grep -oP 'Requires at least: \K[\d.]+' "$WC_CORE_FILE")
9397
REQUIRES_PHP=$(grep -oP 'Requires PHP: \K[\d.]+' "$WC_CORE_FILE")
94-
LATEST_MINOR_RELEASE=$(echo "$LATEST_RELEASE" | grep -oE '^[0-9]+\.[0-9]+' | awk -F. '{printf("%d.%d", $1, ($2-2 < 0 ? 0 : $2-2))}')
98+
LATEST_MINOR_RELEASE=${{ env.LATEST_MINOR_RELEASE }}
9599
echo "REQUIRES_AT_LEAST=$REQUIRES_AT_LEAST" >> $GITHUB_ENV
96100
echo "REQUIRES_PHP=$REQUIRES_PHP" >> $GITHUB_ENV
97101
@@ -250,7 +254,11 @@ jobs:
250254
add-paths: ${{ env.EDITED_FILES }}
251255
commit-message: "Update Requires headers"
252256
title: "Update Requires headers for WooCommerce compatibility"
253-
team-reviewers: woocommerce/progressus
257+
reviewers: |
258+
dustinparker
259+
iyut
260+
bartech
261+
abdalsalaam
254262
body: |
255263
This PR updates plugin headers to ensure compatibility with the latest WooCommerce release.
256264

changelog.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
*** WooCommerce Tax Changelog ***
22

3-
= 3.0.5 - 2025-xx-xx =
3+
= 3.0.6 - 2025-xx-xx =
44
* Fix - TaxJar error notices displaying incorrectly on block cart and checkout.
55

6+
= 3.0.5 - 2025-07-07 =
7+
* Tweak - WooCommerce 10.0 Compatibility.
8+
69
= 3.0.4 - 2025-06-30 =
710
* Fix - Corrected tax calculation for orders shipped within Arizona from stores based in Arizona.
811

npm-shrinkwrap.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "woocommerce-services",
3-
"version": "3.0.4",
3+
"version": "3.0.5",
44
"scripts": {
55
"start": "cross-env NODE_ENV=development CALYPSO_CLIENT=true webpack-dev-server --hot --inline --watch --content-base dist --port 8085 --host 0.0.0.0",
66
"watch": "cross-env NODE_ENV=development CALYPSO_CLIENT=true webpack --watch",

readme.txt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ Requires PHP: 7.4
55
Requires at least: 6.6
66
Requires Plugins: woocommerce
77
Tested up to: 6.8
8-
WC requires at least: 9.7
9-
WC tested up to: 9.9
10-
Stable tag: 3.0.4
8+
WC requires at least: 9.8
9+
WC tested up to: 10.0
10+
Stable tag: 3.0.5
1111
License: GPLv2 or later
1212
License URI: http://www.gnu.org/licenses/gpl-2.0.html
1313

@@ -70,9 +70,12 @@ This plugin relies on the following external services:
7070

7171
== Changelog ==
7272

73-
= 3.0.5 - 2025-xx-xx =
73+
= 3.0.6 - 2025-xx-xx =
7474
* Fix - TaxJar error notices displaying incorrectly on block cart and checkout.
7575

76+
= 3.0.5 - 2025-07-07 =
77+
* Tweak - WooCommerce 10.0 Compatibility.
78+
7679
= 3.0.4 - 2025-06-30 =
7780
* Fix - Corrected tax calculation for orders shipped within Arizona from stores based in Arizona.
7881

woocommerce-services.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
* Author URI: https://woocommerce.com/
99
* Text Domain: woocommerce-services
1010
* Domain Path: /i18n/languages/
11-
* Version: 3.0.4
11+
* Version: 3.0.5
1212
* Requires Plugins: woocommerce
1313
* Requires PHP: 7.4
1414
* Requires at least: 6.6
1515
* Tested up to: 6.8
16-
* WC requires at least: 9.7
17-
* WC tested up to: 9.9
16+
* WC requires at least: 9.8
17+
* WC tested up to: 10.0
1818
*
1919
* Copyright (c) 2017-2023 Automattic
2020
*

0 commit comments

Comments
 (0)