Update bump_version.yaml (#96)

* Update bump_version.yaml

* Suggestions (#98)

* Merge branch 'humble' into delihus-patch-1

---------

Co-authored-by: rafal-gorecki <126687345+rafal-gorecki@users.noreply.github.com>
Co-authored-by: rafal-gorecki <rafal.gorecki@husarion.com>

Author: delihus

.github/workflows/bump_version.yaml .github/workflows/bump.yaml

@@ -1,25 +1,18 @@
 ---
-name: Bump version
+name: Bump
 on:
+  workflow_call:
   workflow_dispatch:
     inputs:
       name:
         description: Version to bump (major, minor, patch)
         default: patch
         required: true
-  pull_request:
-    branches: humble
-    types: [closed]
 
 jobs:
-  industrial_ci:
-    name: Industrial CI
-    uses: ./.github/workflows/industrial_ci.yaml
-
   get-bump:
     name: Get version bump
     runs-on: ubuntu-latest
-    needs: industrial_ci
     outputs:
       bump: ${{ env.BUMP }}
     steps:

.github/workflows/integration.yaml

@@ -0,0 +1,17 @@
+---
+name: CI
+
+on:
+  push:
+
+jobs:
+  tests:
+    name: Tests
+    uses: ./.github/workflows/tests.yaml
+
+  bump:
+    name: Bump
+    needs: tests
+    if: ${{ (github.event_name == 'pull_request' && github.event.pull_request.merged == true) || github.event_name
+      == 'workflow_dispatch' }}
+    uses: ./.github/workflows/bump.yaml

.github/workflows/industrial_ci.yaml .github/workflows/tests.yaml

@@ -1,9 +1,8 @@
 ---
-name: Industrial CI
+name: Tests
 on:
-  workflow_call:
-  workflow_dispatch:
-  push:
+    workflow_call:
+    workflow_dispatch:
 
 jobs:
   black:
@@ -26,13 +25,10 @@ jobs:
       - name: Spellcheck
         uses: rojopolis/spellcheck-github-actions@0.33.1
 
-  ros_industrial_ci:
-    name: ROS Industrial CI
+  industrial_ci:
+    name: Industrial CI
     runs-on: ubuntu-22.04
     timeout-minutes: 30
-    needs:
-      - black
-      - spellcheck
     strategy:
       fail-fast: false
       matrix: