refactor workflows

cern-sis · Oct 2, 2023 · 292b5b3 · 292b5b3
1 parent 32ccaa4
commit 292b5b3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,21 +10,11 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    uses: ./.github/workflows/reusable-workflow.yml
+    with:
+      directory: ${{ matrix.directory }}
     strategy:
       matrix:
         directory:
           - matomo-api
           - Library-Notification-Service
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up services
-        run: |
-          if [ ${{ matrix.directory }} == 'matomo-api' ]; then
-            docker-compose -f matomo-api/docker-compose-tests.yaml up -d
-          fi
-      - name: Use the reusable workflow
-        uses: ./.github/workflows/reusable-workflow.yml
-        with:
-          directory: ${{ matrix.directory }}
diff --git a/.github/workflows/reusable-workflow.yml b/.github/workflows/reusable-workflow.yml
@@ -12,7 +12,11 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-
+      - name: Set up services
+        run: |
+          if [ ${{ inputs.directory }} == 'matomo-api' ]; then
+            docker-compose -f matomo-api/docker-compose-tests.yaml up -d
+          fi
       - name: Setup Python
         uses: actions/setup-python@v4
         with: