Try dependency matrix

shopware · Jan 19, 2024 · 6c251fe · 6c251fe
1 parent 3b58906
commit 6c251fe
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,9 +1,5 @@
 name: Build
-on:
-  pull_request:
-  push:
-    branches:
-      - trunk
+
 jobs:
   build:
     uses: shopware/github-actions/.github/workflows/build-zip.yml@main

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -16,7 +16,27 @@ on:
 
 env:
   SHOPWARE_TOOL_CACHE_PHPSTAN: ${{ github.workspace }}/var/phpstan
+  DEPENDENCIES_WITH_COMMERCIAL: |-
+    [
+      {"name": "SwagCommercial", "repo": "https://shopware:$COMMERCIAL_TOKEN@gitlab.shopware.com/shopware/6/product/commercial.git"},
+      {"name": "SwagCmsExtensions", "repo": "https://shopware:$CMS_TOKEN@gitlab.shopware.com/shopware/6/services/cms-extensions.git"}
+    ]
+  DEPENDENCIES_WITHOUT_COMMERCIAL: |-
+    [
+      {"name": "SwagCmsExtensions", "repo": "https://shopware:$CMS_TOKEN@gitlab.shopware.com/shopware/6/services/cms-extensions.git"}
+    ]
 jobs:
+#  compute:
+#    runs-on: ubuntu-latest
+#    outputs:
+#      DEPS_WITH_COMMERCIAL: ${{ steps.compute.outputs.DEPS_WITH_COMMERCIAL }}
+#      DEPS_WITHOUT_COMMERCIAL: ${{ steps.compute.outputs.DEPS_WITHOUT_COMMERCIAL }}
+#    steps:
+#      - name: Compute outputs
+#        id: compute
+#        run: |
+#          echo "DEPS_WITH_COMMERCIAL=$(echo "$DEPENDENCIES_WITH_COMMERCIAL" | jq -c '.' 2>&1)" >> $GITHUB_OUTPUT
+#          echo "DEPS_WITHOUT_COMMERCIAL=$(echo "$DEPENDENCIES_WITHOUT_COMMERCIAL" | jq -c '.' 2>&1)" >> $GITHUB_OUTPUT
   cs:
     if: github.event_name != 'schedule'
     uses: shopware/github-actions/.github/workflows/cs-fixer.yml@main
@@ -35,25 +55,33 @@ jobs:
         CMS_TOKEN=${{ secrets.CMS_GITLAB_TOKEN }}
         COMMERCIAL_TOKEN=${{ secrets.COMMERCIAL_GITLAB_TOKEN }}
   phpunit:
-    uses: shopware/github-actions/.github/workflows/phpunit.yml@phpunit-matrix
+    uses: shopware/github-actions/.github/workflows/phpunit.yml@main
     strategy:
       matrix:
         phpVersion: [ 8.2, 8.3 ]
-        mysqlVersion: ["mysql:8.0", "mariadb:10.11"]
+#        mysqlVersion: ["mysql:8.0", "mariadb:10.11"]
+        dependencies:
+          - |-
+            [
+              {"name": "SwagCommercial", "repo": "https://shopware:$COMMERCIAL_TOKEN@gitlab.shopware.com/shopware/6/product/commercial.git"},
+              {"name": "SwagCmsExtensions", "repo": "https://shopware:$CMS_TOKEN@gitlab.shopware.com/shopware/6/services/cms-extensions.git"}
+            ]
+          - |-
+            [
+              {"name": "SwagCmsExtensions", "repo": "https://shopware:$CMS_TOKEN@gitlab.shopware.com/shopware/6/services/cms-extensions.git"}
+            ]
     with:
       uploadCoverage: true
       extensionName: SwagPayPal
       shopwareVersion: ${{ matrix.shopware-version }}
       phpVersion: ${{ matrix.phpVersion }}
-      mysqlVersion: ${{ matrix.mysqlVersion }}
-      dependencies: |-
-        [
-          {"name": "SwagCmsExtensions", "repo": "https://shopware:$CMS_TOKEN@gitlab.shopware.com/shopware/6/services/cms-extensions.git"}
-        ]
+#      mysqlVersion: ${{ matrix.mysqlVersion }}
+      dependencies: ${{ matrix.dependencies }}
     secrets:
       env: |-
         CMS_TOKEN=${{ secrets.CMS_GITLAB_TOKEN }}
+        COMMERCIAL_TOKEN=${{ secrets.COMMERCIAL_GITLAB_TOKEN }}
       codecovToken: ${{ secrets.CODECOV_TOKEN }}
-
+#