Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 2.5.17 #2244

Merged
merged 27 commits into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4ce65fc
Add QIT workflow
tomalec Sep 27, 2023
7acf0fb
Require build to run qit workflow.
tomalec Sep 27, 2023
a3dc69b
Run API tests by default in run QIT workflow
tomalec Sep 29, 2023
b0ed7ea
Use the `run-qit-extension` action instead of workflow to run QIT tes…
eason9487 Oct 3, 2023
4a821a7
Merge pull request #2226 from woocommerce/trunk
jorgemd24 Jan 30, 2024
98d7876
Confirm Ads service is connected before fetching conversions
mikkamp Jan 30, 2024
1ee5b80
Catch errors directly when disconnected
mikkamp Jan 30, 2024
5c4f7df
Use latest test branch of QIT actions
tomalec Jan 31, 2024
6696a9d
Test for ReviewAfterConversions
mikkamp Jan 31, 2024
876e3fe
Test for SetupCouponSharing
mikkamp Jan 31, 2024
42eb7ee
Rename qit workflow step name
tomalec Jan 31, 2024
8ce48cb
Remove testing lines from QIT workflow,
tomalec Jan 31, 2024
1ef2067
Merge pull request #2231 from woocommerce/fix/2224-prevent-google-api…
mikkamp Feb 1, 2024
081bcef
Fetch only selected categories for mapping
mikkamp Feb 1, 2024
8f886e3
Test that unselected or unrelated parent category is not included
mikkamp Feb 1, 2024
a9527e8
Upload coverage report for JS unit tests to codecov
mikkamp Feb 5, 2024
ea63860
Revert "Upload coverage report for JS unit tests to codecov"
mikkamp Feb 5, 2024
7bfbb78
Upload coverage report for JS unit tests to codecov
mikkamp Feb 5, 2024
03853e1
Change upload coverage report step
mikkamp Feb 5, 2024
252164a
Merge pull request #2233 from woocommerce/fix/2230-sync-selected-cate…
mikkamp Feb 5, 2024
9685f30
Merge pull request #2238 from woocommerce/dev/js-upload-coverage-report
mikkamp Feb 6, 2024
7611eac
Merge pull request #2114 from woocommerce/dev/qit-workflow
tomalec Feb 6, 2024
dc1f1df
Start `release/2.5.17`.
github-actions[bot] Feb 6, 2024
48c1de9
Remove older changelog entries
tomalec Feb 6, 2024
463e769
Product version bump update
tomalec Feb 6, 2024
b4962c5
Changelog update
tomalec Feb 6, 2024
f7b639b
Update hooks documentation from branch.
github-actions[bot] Feb 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Build

on:
workflow_call:
push:
branches:
- trunk
Expand Down Expand Up @@ -69,3 +70,12 @@ jobs:
uses: woocommerce/grow/publish-extension-dev-build@actions-v1
with:
extension-asset-path: google-listings-and-ads.zip

- name: Publish build artifact
if: ${{ ! ( github.event_name == 'push' && github.ref_name == 'develop' ) }}
uses: actions/upload-artifact@v3
with:
name: google-listings-and-ads.zip
path: ${{ github.workspace }}/google-listings-and-ads.zip
# Do not bloat the storage. Keep in only long enough for a caller workflow to pick it up and follow up with some manual debugging.
retention-days: 2
7 changes: 7 additions & 0 deletions .github/workflows/js-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,10 @@ jobs:

- name: Run JavaScript unit tests
run: npm run test:js

- name: Upload JS unit coverage report
uses: codecov/codecov-action@v3
with:
files: coverage/clover.xml
flags: js-unit-tests
name: js-coverage-report
2 changes: 1 addition & 1 deletion .github/workflows/php-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
run: XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-clover=tests/php-coverage/report.xml

- if: env.generate_coverage == 'true'
name: PHP unit coverage report
name: Upload PHP unit coverage report
uses: codecov/codecov-action@v3
with:
files: tests/php-coverage/report.xml
Expand Down
79 changes: 79 additions & 0 deletions .github/workflows/run-qit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: Run QIT

# **What it does**: Runs a suite of QIT tests for the extension.
# **Why we have it**: To be able to check QIT compatibility at once. For example, to test a specific branch, or upcoming release.

on:
workflow_dispatch:
inputs:
wait:
description: 'Should wait for results'
default: false
type: boolean
# Configure which tests to run.
test-activation:
description: 'Should activation be tested?'
required: true
default: true
type: boolean
test-security:
description: 'Should security be tested?'
required: true
default: true
type: boolean
test-phpstan:
description: 'Should phpstan be tested?'
required: true
default: true
type: boolean
test-api:
description: 'Should API be tested?'
required: true
default: true
type: boolean
test-e2e:
description: 'Should E2E be tested? (takes a lot of time)'
required: true
default: false
type: boolean

# Advanced customization.
ignore-fail:
description: Should pass even if any awaited test fails.
required: false
default: false
type: boolean
options:
description: 'Additional options for `qit` command, like `--optional_features=hpos`.'
required: false

jobs:
build:
name: Build extension
uses: ./.github/workflows/build.yml
secrets: inherit
qit-tests:
name: Run QIT Tests
runs-on: ubuntu-20.04
needs: build
steps:
- name: Download artifact
uses: actions/download-artifact@v3
with:
name: google-listings-and-ads.zip
- name: Run QIT Tests
# Update it with more stable path once merged.
uses: woocommerce/grow/run-qit-extension@actions-v1
with:
qit-partner-user: ${{ secrets.QIT_PARTNER_USER }}
qit-partner-secret: ${{ secrets.QIT_PARTNER_SECRET }}
version: local
wait: ${{ inputs.wait }}
extension: 'google-listings-and-ads'
test-activation: ${{ inputs.test-activation }}
test-security: ${{ inputs.test-security }}
test-phpstan: ${{ inputs.test-phpstan }}
test-api: ${{ inputs.test-api }}
test-e2e: ${{ inputs.test-e2e }}
ignore-fail: ${{ inputs.ignore-fail }}
options: ${{ inputs.options }}
7 changes: 7 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
*** WooCommerce Google Listings and Ads Changelog ***

= 2.5.17 - 2024-02-07 =
* Dev - Add manual QIT workflow.
* Dev - Upload coverage report for JS unit tests to codecov.
* Fix - Only sync selected categories as product type.
* Fix - Prevent notifications from sending request to Google API when disconnected.
* Tweak - WC 8.6 compatibility.

= 2.5.16 - 2024-01-30 =
* Add - Include connected accounts in tracks from the backend.
* Add - Include plugin version, Google Merchant Center account ID, and Google Ads account ID in all frontend tracking events.
Expand Down
6 changes: 3 additions & 3 deletions google-listings-and-ads.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Google Listings and Ads
* Plugin URL: https://wordpress.org/plugins/google-listings-and-ads/
* Description: Native integration with Google that allows merchants to easily display their products across Google’s network.
* Version: 2.5.16
* Version: 2.5.17
* Author: WooCommerce
* Author URI: https://woo.com/
* Text Domain: google-listings-and-ads
Expand All @@ -13,7 +13,7 @@
* Requires PHP Architecture: 64 bits
*
* WC requires at least: 6.9
* WC tested up to: 8.5
* WC tested up to: 8.6
* Woo:
*
* @package WooCommerce\Admin
Expand All @@ -30,7 +30,7 @@

defined( 'ABSPATH' ) || exit;

define( 'WC_GLA_VERSION', '2.5.16' ); // WRCS: DEFINED_VERSION.
define( 'WC_GLA_VERSION', '2.5.17' ); // WRCS: DEFINED_VERSION.
define( 'WC_GLA_MIN_PHP_VER', '7.4' );
define( 'WC_GLA_MIN_WC_VER', '6.9' );

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "google-listings-and-ads",
"title": "Google Listings and Ads",
"version": "2.5.16",
"version": "2.5.17",
"description": "google-listings-and-ads",
"author": "Automattic",
"license": "GPL-3.0-or-later",
Expand Down
16 changes: 8 additions & 8 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Requires at least: 5.9
Tested up to: 6.4
Requires PHP: 7.4
Requires PHP Architecture: 64 Bits
Stable tag: 2.5.16
Stable tag: 2.5.17
License: GPLv3
License URI: https://www.gnu.org/licenses/gpl-3.0.html

Expand Down Expand Up @@ -111,6 +111,13 @@ Yes, you can run both at the same time, and we recommend it! In the US, advertis

== Changelog ==

= 2.5.17 - 2024-02-07 =
* Dev - Add manual QIT workflow.
* Dev - Upload coverage report for JS unit tests to codecov.
* Fix - Only sync selected categories as product type.
* Fix - Prevent notifications from sending request to Google API when disconnected.
* Tweak - WC 8.6 compatibility.

= 2.5.16 - 2024-01-30 =
* Add - Include connected accounts in tracks from the backend.
* Add - Include plugin version, Google Merchant Center account ID, and Google Ads account ID in all frontend tracking events.
Expand All @@ -125,11 +132,4 @@ Yes, you can run both at the same time, and we recommend it! In the US, advertis
* Tweak - WC 8.5 compatibility.
* Update - Upgrade google/apiclient for PHP 8.3 compatibility.

= 2.5.14 - 2023-12-18 =
* Dev - Include PHP 8.3 in tested versions for PHPunit.
* Fix - Item price in purchase event.
* Tweak - Track Budgets and Audience in Onboarding.
* Tweak - WC 8.4 compatibility.
* Update - Change to require Google Ads connection during the onboarding.

[See changelog for all versions](https://raw.githubusercontent.com/woocommerce/google-listings-and-ads/trunk/changelog.txt).
Loading
Loading