Revert "fix(workflow-dispatcher): Group push jobs into single job"

This reverts commit 283dd9b.
ssi-dk · Feb 20, 2024 · 7231a04 · 7231a04
1 parent 283dd9b
commit 7231a04
Showing 1 changed file with 35 additions and 35 deletions.
diff --git a/.github/workflows/workflow-dispatcher.yaml b/.github/workflows/workflow-dispatcher.yaml
@@ -117,7 +117,6 @@ jobs:
           echo "branch name: ${{ steps.branch_name.outputs.branch_name }}"
           echo "cache_version: ${{ steps.cache_version.outputs.cache_version }}"
 
-
   lint:
     needs: trigger
     uses: ./.github/workflows/lint.yaml
@@ -161,7 +160,6 @@ jobs:
       group: R-CMD-check-${{ needs.trigger.outputs.branch_name }}
       cancel-in-progress: true
 
-
   code-coverage:
     needs: trigger
     uses: ./.github/workflows/code-coverage.yaml
@@ -180,6 +178,30 @@ jobs:
       group: code-coverage-${{ needs.trigger.outputs.branch_name }}
       cancel-in-progress: true
 
+  document:
+    needs: trigger
+    uses: ./.github/workflows/document.yaml
+    with:
+      run: ${{ !contains(inputs.skip, 'document') && (
+        inputs.event_name == 'workflow_dispatch' || (
+        needs.trigger.outputs.R_files_changed == 'true' ||
+        needs.trigger.outputs.description_changed == 'true')) }}
+      branch_name: ${{ needs.trigger.outputs.branch_name }}
+    secrets: inherit
+    concurrency:
+      group: push-${{ needs.trigger.outputs.branch_name }}
+
+  render-readme:
+    needs: trigger
+    uses: ./.github/workflows/render-readme.yaml
+    with:
+      run: ${{ !contains(inputs.skip, 'render-readme') && (
+        inputs.event_name == 'workflow_dispatch' ||
+        needs.trigger.outputs.readme_files_changed == 'true') }}
+      branch_name: ${{ needs.trigger.outputs.branch_name }}
+    secrets: inherit
+    concurrency:
+      group: push-${{ needs.trigger.outputs.branch_name }}
 
   pkgdown:
     needs: trigger
@@ -199,40 +221,18 @@ jobs:
       group: pkgdown-${{ needs.trigger.outputs.branch_name }}
       cancel-in-progress: true
 
-  push-jobs:
+  update-lockfile:
     needs: trigger
+    uses: ./.github/workflows/update-lockfile.yaml
+    with:
+      cache_version: ${{ needs.trigger.outputs.cache_version }}
+      run: ${{ !contains(inputs.skip, 'update-lockfile') && (
+        inputs.event_name == 'workflow_dispatch' || (
+        needs.trigger.outputs.main_branch_affected == 'true' && (
+        needs.trigger.outputs.R_files_changed == 'true' ||
+        needs.trigger.outputs.test_files_changed == 'true' ||
+        needs.trigger.outputs.description_changed == 'true'))) }}
+      branch_name: ${{ needs.trigger.outputs.branch_name }}
     secrets: inherit
     concurrency:
       group: push-${{ needs.trigger.outputs.branch_name }}
-
-    steps:
-      - name: document
-        uses: ./.github/workflows/document.yaml
-          with:
-            run: ${{ !contains(inputs.skip, 'document') && (
-              inputs.event_name == 'workflow_dispatch' || (
-              needs.trigger.outputs.R_files_changed == 'true' ||
-              needs.trigger.outputs.description_changed == 'true')) }}
-            branch_name: ${{ needs.trigger.outputs.branch_name }}
-
-
-      - name: render-readme
-        uses: ./.github/workflows/render-readme.yaml
-          with:
-            run: ${{ !contains(inputs.skip, 'render-readme') && (
-              inputs.event_name == 'workflow_dispatch' ||
-              needs.trigger.outputs.readme_files_changed == 'true') }}
-            branch_name: ${{ needs.trigger.outputs.branch_name }}
-
-
-      - name: update-lockfile
-        uses: ./.github/workflows/update-lockfile.yaml
-          with:
-            cache_version: ${{ needs.trigger.outputs.cache_version }}
-            run: ${{ !contains(inputs.skip, 'update-lockfile') && (
-              inputs.event_name == 'workflow_dispatch' || (
-              needs.trigger.outputs.main_branch_affected == 'true' && (
-              needs.trigger.outputs.R_files_changed == 'true' ||
-              needs.trigger.outputs.test_files_changed == 'true' ||
-              needs.trigger.outputs.description_changed == 'true'))) }}
-            branch_name: ${{ needs.trigger.outputs.branch_name }}