Skip to content
This repository has been archived by the owner on Dec 18, 2024. It is now read-only.

Use common action for dash #681

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions .github/actions/check-dash/action.yml

This file was deleted.

34 changes: 19 additions & 15 deletions .github/workflows/kuksa_databroker-cli_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Installing JVM
run: sudo apt update && sudo apt-get install -y default-jre
- uses: actions/checkout@v3
- name: cargo fmt
working-directory: ${{github.workspace}}
Expand All @@ -46,19 +44,6 @@ jobs:
working-directory: ${{github.workspace}}
run: cargo clippy --all-targets -- -W warnings -D warnings

- name: "Createbom: License check and Dash output generation"
working-directory: ${{github.workspace}}/kuksa_databroker/createbom
run: |
cargo install cargo-license
python3 createbom.py --dash ${{github.workspace}}/dash-databroker-cli-deps ../databroker-cli

- name: Dash license check
uses: ./.github/actions/check-dash
with:
dashinput: ${{github.workspace}}/dash-databroker-cli-deps



checkrights:
uses: ./.github/workflows/check_push_rights.yml
secrets: inherit
Expand Down Expand Up @@ -160,3 +145,22 @@ jobs:
src: /app/
export: true
transform: s/app/databroker-cli/

bom:
name: Bill of Material Check
runs-on: ubuntu-latest
needs: build-container

steps:
- uses: actions/checkout@v3

- name: "Createbom: License check and Dash output generation"
working-directory: ${{github.workspace}}/kuksa_databroker/createbom
run: |
cargo install cargo-license
python3 createbom.py --dash ${{github.workspace}}/dash-databroker-deps ../databroker

- name: Dash license check
uses: erikbosch/kuksa-actions/check-dash@erik_dash
with:
dashinput: ${{github.workspace}}/dash-databroker-deps
32 changes: 19 additions & 13 deletions .github/workflows/kuksa_databroker_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Installing JVM
run: sudo apt update && sudo apt-get install -y default-jre
- uses: actions/checkout@v3
- name: cargo fmt
working-directory: ${{github.workspace}}
Expand All @@ -46,17 +44,6 @@ jobs:
working-directory: ${{github.workspace}}
run: cargo clippy --all-targets -- -W warnings -D warnings

- name: "Createbom: License check and Dash output generation"
working-directory: ${{github.workspace}}/kuksa_databroker/createbom
run: |
cargo install cargo-license
python3 createbom.py --dash ${{github.workspace}}/dash-databroker-deps ../databroker

- name: Dash license check
uses: ./.github/actions/check-dash
with:
dashinput: ${{github.workspace}}/dash-databroker-deps

test:
name: Test
runs-on: ubuntu-latest
Expand Down Expand Up @@ -208,3 +195,22 @@ jobs:
DATABROKER_IMAGE: ttl.sh/kuksa.val/kuksa-databroker-${{github.sha}}
run: |
${{github.workspace}}/kuksa_databroker/integration_test/run.sh

bom:
name: Bill of Material Check
runs-on: ubuntu-latest
needs: build-container

steps:
- uses: actions/checkout@v3

- name: "Createbom: License check and Dash output generation"
working-directory: ${{github.workspace}}/kuksa_databroker/createbom
run: |
cargo install cargo-license
python3 createbom.py --dash ${{github.workspace}}/dash-databroker-deps ../databroker

- name: Dash license check
uses: erikbosch/kuksa-actions/check-dash@erik_dash
with:
dashinput: ${{github.workspace}}/dash-databroker-deps