From 66b7eb403d518e0333e3ca81c781f5914f84d823 Mon Sep 17 00:00:00 2001
From: Michel Bade <m.bade@shopware.com>
Date: Wed, 5 Feb 2025 16:23:42 +0100
Subject: [PATCH] chore: adjust workflows for 6.6.x

---
 .github/actions/setup-paypal/action.yml | 3 ++-
 .github/workflows/admin.yml             | 2 +-
 .github/workflows/integration.yml       | 4 ++--
 .github/workflows/php.yml               | 4 ++--
 .github/workflows/storefront.yml        | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/actions/setup-paypal/action.yml b/.github/actions/setup-paypal/action.yml
index 71c36281e..9b38093f4 100644
--- a/.github/actions/setup-paypal/action.yml
+++ b/.github/actions/setup-paypal/action.yml
@@ -29,7 +29,7 @@ inputs:
     required: false
     description: "Which PHP version should be used"
   shopware-version:
-    default: "trunk"
+    default: "6.6.x"
     required: false
     description: "Which version/branch of shopware should be used"
 
@@ -49,6 +49,7 @@ runs:
             {
               "name":"SwagCmsExtensions",
               "repo": "https://github.com/shopware/SwagCmsExtensions.git",
+              "branch": "6.6.x",
               "token": "${{ steps.octo-sts.outputs.token }}"
             }
           ]'
diff --git a/.github/workflows/admin.yml b/.github/workflows/admin.yml
index 8bb0eabb3..d4e1f1734 100644
--- a/.github/workflows/admin.yml
+++ b/.github/workflows/admin.yml
@@ -2,7 +2,7 @@ name: Admin
 on:
   push:
     branches:
-      - trunk
+      - 6.6.x
   pull_request:
     paths:
       - src/Resources/app/administration/**/*
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 63f20cf32..0e9b12af6 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -2,7 +2,7 @@ name: Integration
 on:
   push:
     branches:
-      - trunk
+      - 6.6.x
   pull_request:
   workflow_dispatch:
 
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         MYSQL_IMAGE: ["mysql:8.0", "mariadb:10.11"]
-        PLATFORM_BRANCH: ["v6.6.0.0", "trunk"]
+        PLATFORM_BRANCH: ["v6.6.0.0", "6.6.x"]
         PHP_VERSION: ["8.2", "8.3"]
         WITH_COMMERCIAL: [true, false]
     env:
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 20e85695e..925529d18 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -3,7 +3,7 @@ name: PHP checks
 on:
   push:
     branches:
-      - trunk
+      - 6.6.x
   pull_request:
     paths:
       - bin/*.php
@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        PLATFORM_BRANCH: ["v6.6.0.0", "trunk"]
+        PLATFORM_BRANCH: ["v6.6.0.0", "6.6.x"]
       fail-fast: false
     steps:
       - name: Checkout SwagPayPal
diff --git a/.github/workflows/storefront.yml b/.github/workflows/storefront.yml
index c552b758f..7c6e1b54c 100644
--- a/.github/workflows/storefront.yml
+++ b/.github/workflows/storefront.yml
@@ -2,7 +2,7 @@ name: Storefront
 on:
   push:
     branches:
-      - trunk
+      - 6.6.x
   pull_request:
     paths:
       - src/Resources/app/storefront/**/*