test use actions instead of workflows

shopware · Aug 1, 2024 · 902dcda · 902dcda
1 parent 3855bea
commit 902dcda
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 31 deletions.
diff --git a/.github/workflows/admin.yml b/.github/workflows/admin.yml
@@ -1,12 +1,12 @@
 name: Administration
 on:
   pull_request:
-    paths:
-      - '**/*.js'
-      - '**/*.ts'
-      - '**/*.html'
-      - '**/*.html.twig'
-      - .github/workflows/admin.yml
+    # paths:
+    #   - '**/*.js'
+    #   - '**/*.ts'
+    #   - '**/*.html'
+    #   - '**/*.html.twig'
+    #   - .github/workflows/admin.yml
   push:
     paths:
       - '**/*.js'
@@ -19,12 +19,15 @@ on:
   schedule:
     - cron: '0 3 * * *'
 
+
+env:
+  # steps that use composite actions do not support passing env vars via `:env`
+  CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
 jobs:
   unit:
-    uses: shopware/github-actions/.github/workflows/admin-jest.yml@main
+    uses: shopware/github-actions/.github/actions/admin-jest@add-composite-actions
     with:
       extensionName: ${{ github.event.repository.name }}
       shopwareVersion: trunk
       uploadCoverage: true
-    secrets:
-      codecovToken: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,7 +6,10 @@ on:
       - master
 
 jobs:
-  build:
-    uses: shopware/github-actions/.github/workflows/build-zip.yml@main
-    with:
-      extensionName: ${{ github.event.repository.name }}
+  phpunit:
+    runs-on: ubuntu-latest
+    steps:
+      - name: build
+        uses: shopware/github-actions/.github/actions/build-zip@add-composite-actions
+        with:
+          extensionName: ${{ github.event.repository.name }}
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -14,21 +14,12 @@ on:
     - cron: '0 3 * * *'
 
 jobs:
-  cs:
-    if: github.event_name != 'schedule'
-    uses: shopware/github-actions/.github/workflows/cs-fixer.yml@main
-
-  phpstan:
-    uses: shopware/github-actions/.github/workflows/phpstan.yml@main
-    with:
-      extensionName: ${{ github.event.repository.name }}
-      shopwareVersion: trunk
-
-  phpunit:
-    uses: shopware/github-actions/.github/workflows/phpunit.yml@main
-    with:
-      extensionName: ${{ github.event.repository.name }}
-      shopwareVersion: trunk
-      uploadCoverage: true
-    secrets:
-      codecovToken: ${{ secrets.CODECOV_TOKEN }}
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: phpunit
+        uses: shopware/github-actions/.github/actions/phpunit@add-composite-actions
+        with:
+          extensionName: ${{ github.event.repository.name }}
+          shopwareVersion: trunk
+          uploadCoverage: false