diff --git a/.github/workflows/build-beta-app.yml b/.github/workflows/build-beta-app.yml index ff6344ec802..9c6c41645a0 100644 --- a/.github/workflows/build-beta-app.yml +++ b/.github/workflows/build-beta-app.yml @@ -3,11 +3,11 @@ name: "Bbeta app" on: push: branches: - - main + - develop merge_group: pull_request: branches: - - main + - develop types: [ opened, synchronize ] workflow_call: @@ -19,11 +19,10 @@ jobs: code-analysis: uses: ./.github/workflows/code-analysis.yml unit-tests: - needs: [ code-analysis ] uses: ./.github/workflows/gradle-run-unit-tests.yml build-app: - needs: [ unit-tests ] - runs-on: buildjet-8vcpu-ubuntu-2204 + needs: [ unit-tests, code-analysis ] + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/build-develop-app.yml b/.github/workflows/build-develop-app.yml index 1df2359d57e..467fa6b5a01 100644 --- a/.github/workflows/build-develop-app.yml +++ b/.github/workflows/build-develop-app.yml @@ -2,10 +2,10 @@ name: "Develop app" on: push: branches: - - develop + - rc pull_request: branches: - - develop + - rc types: [ opened, synchronize ] concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number }} diff --git a/.github/workflows/build-prod-app.yml b/.github/workflows/build-prod-app.yml index 20a58ad07dd..c9fbfb71905 100644 --- a/.github/workflows/build-prod-app.yml +++ b/.github/workflows/build-prod-app.yml @@ -17,11 +17,10 @@ jobs: code-analysis: uses: ./.github/workflows/code-analysis.yml unit-tests: - needs: [ code-analysis ] uses: ./.github/workflows/gradle-run-unit-tests.yml build-app: - needs: [ unit-tests ] - runs-on: buildjet-8vcpu-ubuntu-2204 + needs: [ unit-tests, code-analysis ] + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/build-rc-app.yml b/.github/workflows/build-rc-app.yml index a513d131860..1d90856db57 100644 --- a/.github/workflows/build-rc-app.yml +++ b/.github/workflows/build-rc-app.yml @@ -19,11 +19,10 @@ jobs: code-analysis: uses: ./.github/workflows/code-analysis.yml unit-tests: - needs: [ code-analysis ] uses: ./.github/workflows/gradle-run-unit-tests.yml build-app: - needs: [ unit-tests ] - runs-on: buildjet-8vcpu-ubuntu-2204 + needs: [ unit-tests, code-analysis ] + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/gradle-run-unit-tests.yml b/.github/workflows/gradle-run-unit-tests.yml index ca907bef3ec..ed9ec7e0864 100644 --- a/.github/workflows/gradle-run-unit-tests.yml +++ b/.github/workflows/gradle-run-unit-tests.yml @@ -6,7 +6,7 @@ permissions: contents: read jobs: - build-app: + testCoverage: runs-on: buildjet-8vcpu-ubuntu-2204 steps: - name: Checkout