From 5ff9d2149561ef4160ddcd81a49b091176faa8d6 Mon Sep 17 00:00:00 2001 From: Vitalij Mik Date: Fri, 9 Feb 2024 14:05:35 +0100 Subject: [PATCH] NTR: merge master commit 3a0f05dc025ae4733363b2548726b7290b159ed6 Author: Vitalij Mik Date: Fri Feb 9 12:28:17 2024 +0100 NTR: test SW 6.5.8.4 (#703) Co-authored-by: Vitalij Mik commit f8390b387f3ce8fb6a894d32470bb2a24414b3e4 Author: Vitalij Mik Date: Fri Feb 9 11:29:47 2024 +0100 NTR: new shopware version (#702) Co-authored-by: Vitalij Mik --- .github/actions/build-plugin/action.yml | 2 +- .github/workflows/ci_pipe.yml | 2 +- .github/workflows/nightly_pipe.yml | 2 +- .github/workflows/pr_pipe.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/build-plugin/action.yml b/.github/actions/build-plugin/action.yml index 516e4c0c2..8fa2f08be 100644 --- a/.github/actions/build-plugin/action.yml +++ b/.github/actions/build-plugin/action.yml @@ -8,7 +8,7 @@ runs: - name: Start Docker shell: bash run: | - docker run --rm --name shop --env NODE_VERSION=18 --env PHP_VERSION=8.1 -d dockware/dev:6.5.8.2 + docker run --rm --name shop --env NODE_VERSION=18 --env PHP_VERSION=8.1 -d dockware/dev:6.5.8.4 sleep 20 docker logs shop diff --git a/.github/workflows/ci_pipe.yml b/.github/workflows/ci_pipe.yml index 0e2f925d3..4e2a4f7a7 100644 --- a/.github/workflows/ci_pipe.yml +++ b/.github/workflows/ci_pipe.yml @@ -340,7 +340,7 @@ jobs: fail-fast: false matrix: include: - - shopware: '6.5.8.2' + - shopware: '6.5.8.4' php: '8.2' - shopware: '6.5.6.1' php: '8.2' diff --git a/.github/workflows/nightly_pipe.yml b/.github/workflows/nightly_pipe.yml index 819eab8c6..94052ec11 100644 --- a/.github/workflows/nightly_pipe.yml +++ b/.github/workflows/nightly_pipe.yml @@ -334,7 +334,7 @@ jobs: fail-fast: false matrix: include: - - shopware: '6.5.8.2' + - shopware: '6.5.8.4' php: '8.2' - shopware: '6.5.6.1' php: '8.2' diff --git a/.github/workflows/pr_pipe.yml b/.github/workflows/pr_pipe.yml index f2ac8b31f..c4910505e 100644 --- a/.github/workflows/pr_pipe.yml +++ b/.github/workflows/pr_pipe.yml @@ -333,7 +333,7 @@ jobs: fail-fast: false matrix: include: - - shopware: '6.5.8.2' + - shopware: '6.5.8.4' php: '8.2' - shopware: '6.5.5.2' php: '8.2'