Skip to content

Commit

Permalink
Fixing build action triggers
Browse files Browse the repository at this point in the history
Rationale:
Kuksa-val build was triggered too often,

But then, should we not trigger when certs and proto files are changed as well
(Even if some use symbolic links)
  • Loading branch information
erikbosch authored and SebastianSchildt committed Aug 31, 2023
1 parent 85c2b8c commit 90b10ec
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 119 deletions.
94 changes: 0 additions & 94 deletions .github/workflows/clean-images.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .github/workflows/kuksa-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ on:
paths:
- ".github/workflows/kuksa-client.yml"
- "kuksa-client/**"
- "kuksa_certificates/**"
- "proto/**"
workflow_dispatch:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kuksa-go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ on:
paths:
- ".github/workflows/kuksa-go.yml"
- "kuksa_go_client/**"
- "proto/**"
workflow_dispatch:

jobs:
Expand Down Expand Up @@ -48,4 +49,3 @@ jobs:
with:
version: latest
working-directory: kuksa_go_client

13 changes: 7 additions & 6 deletions .github/workflows/kuksa_databroker-cli_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ on:
paths:
- ".github/workflows/kuksa_databroker-cli_build.yml"
- "kuksa_databroker/**"
- "proto/**"
- "Cargo.*"
- "Cross.toml"
workflow_call:
Expand Down Expand Up @@ -67,7 +68,7 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
with:
submodules: recursive

- name: Docker meta
Expand All @@ -84,11 +85,11 @@ jobs:
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
# only needed for runners without buildx setup, will be slow
# only needed for runners without buildx setup, will be slow
#- name: Set up QEMU
# uses: docker/setup-qemu-action@v2

# - name: Set up Docker Buildx
# id: buildx
# uses: docker/setup-buildx-action@v2
Expand Down Expand Up @@ -130,13 +131,13 @@ jobs:
push: true
tags: "ttl.sh/kuksa.val/kuksa-databroker-cli-${{github.sha}}"
labels: ${{ steps.meta.outputs.labels }}


- name: Posting message
uses: ./.github/actions/post-container-location
with:
image: ttl.sh/kuksa.val/kuksa-databroker-cli-${{github.sha}}

- name: Extracting ARM64 binaries
uses: ./.github/actions/copy-from-oci
with:
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/kuksa_databroker_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ on:
paths:
- ".github/workflows/kuksa_databroker_build.yml"
- "kuksa_databroker/**"
- "proto/**"
- "Cargo.*"
- "Cross.toml"
workflow_call:
Expand Down Expand Up @@ -100,7 +101,7 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
with:
submodules: recursive

- name: Docker meta
Expand All @@ -117,11 +118,11 @@ jobs:
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
# only needed for runners without buildx setup, will be slow
# only needed for runners without buildx setup, will be slow
#- name: Set up QEMU
# uses: docker/setup-qemu-action@v2

#- name: Set up Docker Buildx
# id: buildx
# uses: docker/setup-buildx-action@v2
Expand Down Expand Up @@ -163,7 +164,7 @@ jobs:
push: true
tags: "ttl.sh/kuksa.val/kuksa-databroker-${{github.sha}}"
labels: ${{ steps.meta.outputs.labels }}

- name: Posting message
uses: ./.github/actions/post-container-location
with:
Expand All @@ -179,7 +180,7 @@ jobs:
export: true
transform: s/app/databroker/


- name: Extracting AMD64 binaries
uses: ./.github/actions/copy-from-oci
with:
Expand All @@ -196,9 +197,9 @@ jobs:
needs: [build-container]

steps:

- uses: actions/checkout@v3

- name: Run integration test
env:
DATABROKER_IMAGE: ttl.sh/kuksa.val/kuksa-databroker-${{github.sha}}
Expand Down
17 changes: 7 additions & 10 deletions .github/workflows/kuksa_val_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,12 @@ on:
branches: [ master ]
pull_request:
branches: [ master ]
paths-ignore:
- ".github/workflows/kuksa_databroker_build.yml"
- "kuksa_databroker/**"
- "kuksa_go_client/**"
- "kuksa_client/**"
- "Cargo.*"
- "Cross.toml"
paths:
- ".github/workflows/kuksa_val_docker.yml"
- "kuksa-val-server/**"
- "kuksa_certificates/**"
workflow_dispatch:

jobs:
checkrights:
uses: ./.github/workflows/check_push_rights.yml
Expand All @@ -26,7 +23,7 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
with:
submodules: recursive

- name: Docker meta
Expand Down Expand Up @@ -64,7 +61,7 @@ jobs:
file: ./kuksa-val-server/docker/Dockerfile
context: .
push: true
tags: |
tags: |
${{ steps.meta.outputs.tags }}
ttl.sh/kuksa.val/kuksa-server-${{github.sha}}
labels: ${{ steps.meta.outputs.labels }}
Expand Down

0 comments on commit 90b10ec

Please sign in to comment.