chore: adjust workflows for 6.6.x

shopware · Feb 5, 2025 · 66b7eb4 · 66b7eb4
1 parent ccdac91
commit 66b7eb4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -2,7 +2,7 @@ name: Storefront
 on:
   push:
     branches:
-      - trunk
+      - 6.6.x
   pull_request:
     paths:
       - src/Resources/app/storefront/**/*
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: Admin @@
     on:
       push:
         branches:
-          - trunk
+          - 6.6.x
       pull_request:
         paths:
           - src/Resources/app/administration/**/*
@@ Expand Down @@