Yhdistetty lint ja test jobit CI:ssä

Opetushallitus · Nov 2, 2024 · 752889b · 752889b
1 parent 9409e0e
commit 752889b
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,24 +12,18 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  lint:
-    timeout-minutes: 5
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup-next-env
-      - name: Run lint
-        run: |
-          npm run typecheck
-          npm run lint
-  test:
+  lint-and-test:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-next-env
+      - name: Check types
+        run: npm run typecheck
+      - name: Run linter
+        run: npm run lint
       - name: Run unit tests
-        run: npm test
+        run: npm run test
   e2e:
     timeout-minutes: 15
     runs-on: ubuntu-latest
@@ -55,7 +49,7 @@ jobs:
           retention-days: 10
           if-no-files-found: ignore
   deploy-zip:
-    needs: [lint, test, e2e]
+    needs: [lint-and-test, e2e]
     timeout-minutes: 10
     runs-on: ubuntu-latest
     permissions: