Skip to content

Commit

Permalink
Merge branch 'main' into feature/pseventbus-v4-base
Browse files Browse the repository at this point in the history
  • Loading branch information
fox-john authored Nov 20, 2024
2 parents f3e851a + 7bc604f commit 4365a4b
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 11 deletions.
21 changes: 21 additions & 0 deletions .github/README_CI.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Github CI/CD

## Dependencies

### Github

- [actions/checkout@v4](https://github.com/actions/checkout)
- [actions/cache@v4](https://github.com/actions/cache)
- [actions/setup-node@v4](https://github.com/actions/setup-node)

### pnpm

- [pnpm/action-setup@v4](https://github.com/pnpm/action-setup)

### Others

- [shivammathur/setup-php@v2](https://github.com/shivammathur/setup-php)
- [softprops/action-gh-release@v2](https://github.com/softprops/action-gh-release)
- [dsaltares/fetch-gh-release-asset@master](https://github.com/dsaltares/fetch-gh-release-asset)
- [mheap/github-action-required-labels@v5](https://github.com/mheap/github-action-required-labels)
- [rtCamp/action-slack-notify@v2](https://github.com/rtCamp/action-slack-notify)
4 changes: 2 additions & 2 deletions .github/workflows/build-release-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
with:
ref: ${{ github.ref }}

- uses: pnpm/action-setup@v3
- uses: pnpm/action-setup@v4
with:
version: latest

Expand All @@ -36,7 +36,7 @@ jobs:
cache-dependency-path: e2e/pnpm-lock.yaml

- name: Cache vendor folder
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: vendor
key: php-${{ hashFiles('composer.lock') }}
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/quality-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Cache vendor folder
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: vendor
key: php-${{ hashFiles('composer.lock') }}
Expand All @@ -54,13 +54,14 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 15
strategy:
fail-fast: false
matrix:
ps_version: ["1.6.1.11", "1.7.8.10", "8.1.6"]
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Cache vendor folder
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: vendor
key: php-${{ hashFiles('composer.lock') }}
Expand All @@ -75,7 +76,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Cache vendor folder
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: vendor
key: php-${{ hashFiles('composer.lock') }}
Expand All @@ -88,6 +89,7 @@ jobs:
timeout-minutes: 30
if: ${{ github.event_name == 'pull_request' }}
strategy:
fail-fast: false
matrix:
ps_version: ["1.6.1.11", "1.7.8.10", "8.1.4", "nightly"]
steps:
Expand All @@ -96,7 +98,7 @@ jobs:
with:
ref: ${{ github.ref }}

- uses: pnpm/action-setup@v3
- uses: pnpm/action-setup@v4
with:
version: latest

Expand All @@ -107,7 +109,7 @@ jobs:
cache-dependency-path: e2e/pnpm-lock.yaml

- name: Cache vendor folder
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: vendor
key: php-${{ hashFiles('composer.lock') }}
Expand Down Expand Up @@ -150,7 +152,7 @@ jobs:
with:
ref: ${{ github.ref }}

- uses: pnpm/action-setup@v3
- uses: pnpm/action-setup@v4
with:
version: latest

Expand All @@ -161,7 +163,7 @@ jobs:
cache-dependency-path: e2e/pnpm-lock.yaml

- name: Cache vendor folder
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: vendor
key: php-${{ hashFiles('composer.lock') }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/radis-to-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ jobs:
name: Is ready 🥕
runs-on: ubuntu-latest
steps:
- uses: mheap/github-action-required-labels@v3
- uses: mheap/github-action-required-labels@v5
with:
mode: minimum
count: 1
labels: "🥕 Radis to review"
- uses: mheap/github-action-required-labels@v3
- uses: mheap/github-action-required-labels@v5
with:
mode: exactly
count: 0
Expand Down
24 changes: 24 additions & 0 deletions upgrade/Upgrade-3.2.1.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php

/**
* @return bool
*/
function upgrade_module_3_2_1()
{
$db = Db::getInstance();

// Delete all entries with type "cart_rules" from eventbus_incremental_sync
$db->delete('eventbus_incremental_sync', '`type` = "cart_rules"');

// reset full sync for cart_rules
$db->update(
'eventbus_type_sync',
[
'offset' => 0,
'full_sync_finished' => 0,
],
'`type` = "cart_rules"'
);

return true;
}

0 comments on commit 4365a4b

Please sign in to comment.