From 06f7c935ef933d41cffe00c0ee0385320c0f2eda Mon Sep 17 00:00:00 2001 From: Andre Weber Date: Thu, 6 Feb 2025 11:29:54 +0100 Subject: [PATCH] chore: Fix Failing Tests --- .github/actions/run-tests/action.yml | 2 +- .github/actions/setup-project/action.yaml | 2 +- ...gration_main-master.yaml => daily_integration_main.yaml} | 4 ++-- docs/CONTRIBUTING.md | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) rename .github/workflows/{daily_integration_main-master.yaml => daily_integration_main.yaml} (85%) diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml index 72fbe127..a568d852 100644 --- a/.github/actions/run-tests/action.yml +++ b/.github/actions/run-tests/action.yml @@ -10,7 +10,7 @@ inputs: default: 'false' databroker-version: description: "Databroker Version" - default: 'master' + default: 'main' kotest-tag: description: > The Kotest Tag to use when executing the tests. Check Tag.kt for valid options. Different Tags might require the diff --git a/.github/actions/setup-project/action.yaml b/.github/actions/setup-project/action.yaml index 1e257196..63dc81e6 100644 --- a/.github/actions/setup-project/action.yaml +++ b/.github/actions/setup-project/action.yaml @@ -10,4 +10,4 @@ runs: java-version: '21' - name: Setup Gradle - uses: gradle/gradle-build-action@v3 + uses: gradle/actions/setup-gradle@v3 diff --git a/.github/workflows/daily_integration_main-master.yaml b/.github/workflows/daily_integration_main.yaml similarity index 85% rename from .github/workflows/daily_integration_main-master.yaml rename to .github/workflows/daily_integration_main.yaml index e6cf1179..b4558cc8 100644 --- a/.github/workflows/daily_integration_main-master.yaml +++ b/.github/workflows/daily_integration_main.yaml @@ -1,4 +1,4 @@ -name: SDK:main <-> Databroker:master +name: SDK:main <-> Databroker:main on: schedule: @@ -20,5 +20,5 @@ jobs: uses: ./.github/actions/run-tests with: upload-test-reports: true - databroker-version: master + databroker-version: main kotest-tag: "Integration" diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 9af15d3a..d3331ded 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -95,15 +95,15 @@ This means that issues exist between the latest released version of the SDK and If this build fails it should be considered as a potential bigger issue => A hotfix or new release needs to be done -**SDK:latestRelease -> Databroker:master** +**SDK:latestRelease -> Databroker:main** This means, that the latest released version of the SDK is not compatible with the currently developed version of the Databroker. If this build fails it should be considered as a warning => Required fixes should be part of the next SDK release -**SDK:main -> Databroker:master** +**SDK:main -> Databroker:main** -[![SDK:main <-> Databroker:master](https://github.com/eclipse-kuksa/kuksa-android-sdk/actions/workflows/daily_integration_main-master.yaml/badge.svg)](https://github.com/eclipse-kuksa/kuksa-android-sdk/actions/workflows/daily_integration_main-master.yaml?query=branch%3Amain) +[![SDK:main <-> Databroker:master](https://github.com/eclipse-kuksa/kuksa-android-sdk/actions/workflows/daily_integration_main.yaml/badge.svg)](https://github.com/eclipse-kuksa/kuksa-android-sdk/actions/workflows/daily_integration_main-master.yaml?query=branch%3Amain) This means both the SDK and Databroker are running in a kind of "bleeding edge" state in their currently developed version.