diff --git a/.github/workflows/black.yaml b/.github/workflows/black.yaml deleted file mode 100644 index bd5a81f1..00000000 --- a/.github/workflows/black.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -name: Black python lint - -on: - workflow_call: - -jobs: - lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: psf/black@stable - with: - options: --line-length=99 diff --git a/.github/workflows/bump_version.yaml b/.github/workflows/bump_version.yaml index cfbdd918..a0a6574f 100644 --- a/.github/workflows/bump_version.yaml +++ b/.github/workflows/bump_version.yaml @@ -13,6 +13,7 @@ on: jobs: industrial_ci: + name: Industrial CI uses: ./.github/workflows/industrial_ci.yaml get-bump: diff --git a/.github/workflows/industrial_ci.yaml b/.github/workflows/industrial_ci.yaml index f4a98deb..8d146895 100644 --- a/.github/workflows/industrial_ci.yaml +++ b/.github/workflows/industrial_ci.yaml @@ -7,16 +7,28 @@ on: jobs: - black_test: - uses: ./.github/workflows/black.yaml + black: + name: Black + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: psf/black@stable + with: + options: --line-length=99 - spellcheck_test: - uses: ./.github/workflows/spellcheck.yaml + spellcheck: + name: Spellcheck + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: rojopolis/spellcheck-github-actions@0.33.1 + name: Spellcheck - industrial_ci: + ros_industrial_ci: + name: ROS Industrial CI needs: - - black_test - - spellcheck_test + - black + - spellcheck strategy: fail-fast: false matrix: diff --git a/.github/workflows/spellcheck.yaml b/.github/workflows/spellcheck.yaml deleted file mode 100644 index 84317935..00000000 --- a/.github/workflows/spellcheck.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -name: Spellcheck Action - -on: - workflow_call: - -jobs: - build: - name: Spellcheck - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: rojopolis/spellcheck-github-actions@0.33.1 - name: Spellcheck