Skip to content

Commit

Permalink
Merge release/6.7.0 into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
malithsen committed Nov 1, 2023
2 parents 705c3a4 + a59400c commit 0ba99c9
Show file tree
Hide file tree
Showing 226 changed files with 7,606 additions and 7,684 deletions.
4 changes: 2 additions & 2 deletions .github/actions/version-check/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ runs:
TRIMMED_VERSION=$(echo "$VERSION" | xargs)
if ${{ env.IS_PRERELEASE == 'true' }}; then
VERSION_FORMAT="^[0-9]\.[0-9]\.[0-9]-test-[1-9]$"
VERSION_FORMAT="^[0-9]+\.[0-9]\.[0-9]+-test-[1-9]$"
else
VERSION_FORMAT="^[0-9]\.[0-9]\.[0-9]$"
VERSION_FORMAT="^[0-9]+\.[0-9]\.[0-9]+$"
fi
if [[ $TRIMMED_VERSION =~ $VERSION_FORMAT ]]; then
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@ jobs:
woocommerce: [ 'latest' ]
wordpress: [ 'latest' ]
php: [ '7.4' ]
directory: [ 'includes', 'src' ]
env:
WP_VERSION: ${{ matrix.wordpress }}
WC_VERSION: ${{ matrix.woocommerce }}
WP_VERSION: ${{ matrix.wordpress }}
WC_VERSION: ${{ matrix.woocommerce }}
COVERAGE_DIR: ${{ matrix.directory }}
steps:
# clone the repository
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: "Generate matrix"
id: generate_matrix
run: |
WC_VERSIONS=$( echo "[\"$WC_MIN_SUPPORTED_VERSION\", \"latest\", \"beta\"]" )
WC_VERSIONS=$( echo "[\"7.7.0\", \"latest\", \"beta\"]" )
echo "matrix={\"woocommerce\":$WC_VERSIONS,\"test_groups\":[\"wcpay\", \"subscriptions\"],\"test_branches\":[\"merchant\", \"shopper\"]}" >> $GITHUB_OUTPUT
# Run WCPay & subscriptions tests against specific WC versions
Expand Down
2 changes: 2 additions & 0 deletions assets/css/admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
width: 2rem;
background-size: contain;
background-repeat: no-repeat;
border-radius: 2px;
outline: 1px solid rgba( 0, 0, 0, 0.25 );
}

.payment-method__brand--amex {
Expand Down
5 changes: 4 additions & 1 deletion assets/images/cards/amex.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion assets/images/cards/apple-pay.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 6 additions & 1 deletion assets/images/cards/diners.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 0ba99c9

Please sign in to comment.