Skip to content

Commit e94639b

Browse files
committed
Fix workflows
Previously no docker containers were published
1 parent 9423e11 commit e94639b

File tree

6 files changed

+31
-111
lines changed

6 files changed

+31
-111
lines changed

.github/actions/copy-from-oci/action.yml

Lines changed: 0 additions & 60 deletions
This file was deleted.

.github/actions/post-container-location/action.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

.github/workflows/kuksa_databroker-cli_build.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ name: Build kuksa-databroker-cli
1515

1616
on:
1717
push:
18-
branches: [ master ]
18+
branches: [ main ]
1919
pull_request:
2020
paths:
2121
- ".github/workflows/kuksa_databroker-cli_build.yml"
@@ -30,6 +30,10 @@ concurrency:
3030
group: ${{ github.ref }}-${{ github.workflow }}
3131
cancel-in-progress: true
3232

33+
# Needed as default_workflow_permissions is "read"
34+
permissions:
35+
packages: write
36+
3337
jobs:
3438
lint:
3539
name: Lint
@@ -52,7 +56,7 @@ jobs:
5256
- name: cargo clippy
5357
working-directory: ${{github.workspace}}
5458
run: cargo clippy --all-targets -- -W warnings -D warnings
55-
59+
5660
check_ghcr_push:
5761
name: Check access rights
5862
uses: eclipse-kuksa/kuksa-actions/.github/workflows/check_ghcr_push.yml@2
@@ -152,9 +156,8 @@ jobs:
152156
# Same problem as described in https://github.com/orgs/community/discussions/45969
153157
provenance: false
154158

155-
156159
- name: Posting message
157-
uses: ./.github/actions/post-container-location
160+
uses: eclipse-kuksa/kuksa-actions/post-container-location@2
158161
with:
159162
image: ttl.sh/eclipse-kuksa/kuksa-databroker-cli-${{github.sha}}
160163

.github/workflows/kuksa_databroker_build.yml

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ name: Build kuksa-databroker
1515

1616
on:
1717
push:
18-
branches: [ master ]
18+
branches: [ main]
1919
pull_request:
2020
workflow_call:
2121
workflow_dispatch:
@@ -24,6 +24,10 @@ concurrency:
2424
group: ${{ github.ref }}-${{ github.workflow }}
2525
cancel-in-progress: true
2626

27+
# Needed as default_workflow_permissions is "read"
28+
permissions:
29+
packages: write
30+
2731
jobs:
2832
lint:
2933
name: Lint
@@ -77,6 +81,7 @@ jobs:
7781
- name: Generate code coverage
7882
run: cargo llvm-cov --all-features --workspace --lcov --output-path lcov.info
7983
- name: Upload coverage to Codecov
84+
# To use v4 a token must be specifed by "token: ${{ secrets.CODECOV_TOKEN }}""
8085
uses: codecov/codecov-action@v3
8186
with:
8287
files: lcov.info
@@ -230,29 +235,10 @@ jobs:
230235
provenance: false
231236

232237
- name: Posting message
233-
uses: ./.github/actions/post-container-location
238+
uses: eclipse-kuksa/kuksa-actions/post-container-location@2
234239
with:
235240
image: ttl.sh/eclipse-kuksa/kuksa-databroker-${{github.sha}}
236241

237-
# - name: "Archiving AMD64 artifacts"
238-
# uses: actions/upload-artifact@v4
239-
# with:
240-
# name: databroker-amd64
241-
# path: ${{github.workspace}}/dist/amd64
242-
243-
# - name: "Archiving ARM64 artifacts"
244-
# uses: actions/upload-artifact@v4
245-
# with:
246-
# name: databroker-arm64
247-
# path: ${{github.workspace}}/dist/arm64
248-
249-
# - name: "Archiving RISCV64 artifacts"
250-
# uses: actions/upload-artifact@v4
251-
# with:
252-
# name: databroker-riscv64
253-
# path: ${{github.workspace}}/dist/riscv64
254-
255-
256242
integration-test:
257243
name: Run integration test
258244
runs-on: ubuntu-latest

.github/workflows/pre-commit.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ jobs:
1616
with:
1717
# required to grab the history of the PR
1818
fetch-depth: 0
19-
- uses: actions/setup-python@v3
20-
- uses: pre-commit/[email protected]
19+
- uses: actions/setup-python@v5
20+
with:
21+
python-version: '3.10'
22+
- uses: pre-commit/[email protected]
2123
with:
2224
extra_args: --color=always --from-ref ${{ github.event.pull_request.base.sha }} --to-ref ${{ github.event.pull_request.head.sha }}

.pre-commit-config.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# See https://pre-commit.com for more information
2+
# See https://pre-commit.com/hooks.html for more hooks
3+
repos:
4+
- repo: https://github.com/pre-commit/pre-commit-hooks
5+
rev: v3.2.0
6+
hooks:
7+
- id: trailing-whitespace
8+
exclude_types: ["dbc"]
9+
- id: end-of-file-fixer
10+
exclude_types: ["dbc", "json"]
11+
exclude: \.token$
12+
- id: check-yaml
13+
- id: check-added-large-files

0 commit comments

Comments
 (0)