diff --git a/.github/workflows/codestyle.yml b/.github/workflows/codestyle.yml index e9cc44f5f70..fb82623f63b 100644 --- a/.github/workflows/codestyle.yml +++ b/.github/workflows/codestyle.yml @@ -1,13 +1,21 @@ name: "Check Codestyle" -on: [workflow_call] +on: + workflow_call: + inputs: + runs-on: + description: 'Runner type' + required: true + type: string jobs: - static-code-analysis: - runs-on: ubuntu-latest + java-gradle-setup: uses: ./.github/workflows/shared/setup-java-gradle.yml with: runs-on: ubuntu-latest + static-code-analysis: + runs-on: ubuntu-latest + needs: [ java-gradle-setup ] steps: - name: Run Detekt run: | diff --git a/.github/workflows/generate-dokka.yml b/.github/workflows/generate-dokka.yml index 63bd11a8ce3..0855987102c 100644 --- a/.github/workflows/generate-dokka.yml +++ b/.github/workflows/generate-dokka.yml @@ -7,23 +7,25 @@ on: workflow_dispatch: jobs: - publish: + java-gradle-setup: + uses: ./.github/workflows/shared/setup-java-gradle.yml + with: runs-on: ubuntu-latest - steps: - - uses: ./.github/workflows/shared/setup-java-gradle.yml - with: - runs-on: ubuntu-latest + publish: + runs-on: ubuntu-latest + needs: [ java-gradle-setup ] + steps: - - name: Generate Dokka docs - run: make doc/generate-kdocs - env: - GITHUB_USER: ${{ github.actor }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Generate Dokka docs + run: make doc/generate-kdocs + env: + GITHUB_USER: ${{ github.actor }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Deploy docs 🚀 - uses: JamesIves/github-pages-deploy-action@v4.2.5 - with: - branch: gh-pages - clean: false - folder: build/dokka/htmlMultiModule - target-folder: docs + - name: Deploy docs 🚀 + uses: JamesIves/github-pages-deploy-action@v4.2.5 + with: + branch: gh-pages + clean: false + folder: build/dokka/htmlMultiModule + target-folder: docs diff --git a/.github/workflows/gradle-android-instrumented-tests.yml b/.github/workflows/gradle-android-instrumented-tests.yml index 563b8c5df7c..eb78169e802 100644 --- a/.github/workflows/gradle-android-instrumented-tests.yml +++ b/.github/workflows/gradle-android-instrumented-tests.yml @@ -20,10 +20,6 @@ jobs: api-level: [ 34 ] steps: - - uses: ./.github/workflows/shared/setup-java-gradle.yml - with: - runs-on: ubuntu-latest - - name: AVD cache uses: actions/cache@v4 id: avd-cache diff --git a/.github/workflows/gradle-android-unit-tests.yml b/.github/workflows/gradle-android-unit-tests.yml index 1e7f7f54c7b..5b08b4caa97 100644 --- a/.github/workflows/gradle-android-unit-tests.yml +++ b/.github/workflows/gradle-android-unit-tests.yml @@ -12,10 +12,11 @@ concurrency: jobs: detekt: uses: ./.github/workflows/codestyle.yml + with: + runs-on: ubuntu-latest gradle-run-tests: needs: [ detekt ] runs-on: ubuntu-latest - steps: - name: Build the samples env: diff --git a/.github/workflows/gradle-ios-tests.yml b/.github/workflows/gradle-ios-tests.yml index ca11a3d0e0b..faf3e167af7 100644 --- a/.github/workflows/gradle-ios-tests.yml +++ b/.github/workflows/gradle-ios-tests.yml @@ -12,15 +12,13 @@ concurrency: jobs: detekt: uses: ./.github/workflows/codestyle.yml + with: + runs-on: macos-latest gradle-run-tests: needs: [detekt] runs-on: macos-latest steps: - - uses: ./.github/workflows/shared/setup-java-gradle.yml - with: - runs-on: macos-latest - - name: Set up Python 3.11 uses: actions/setup-python@v5 with: