Skip to content

Commit 6a6b74f

Browse files
authored
Merge pull request #161 from mindbox-cloud/release/2.13.4
Release 2.13.4
2 parents 1174010 + ca249dd commit 6a6b74f

23 files changed

+584
-91
lines changed

.github/workflows/analyze_and_test.yml

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,29 @@
1-
name: analyze_and_test
1+
name: Analyzes and Tests
22

33
on:
4+
push:
5+
branches:
6+
- develop
7+
- mission/*
48
pull_request:
5-
branches: [ develop ]
9+
types:
10+
- opened
11+
- reopened
12+
- synchronize
613
workflow_call:
14+
inputs:
15+
branch:
16+
required: true
17+
type: string
718

819
jobs:
920
platform_interface_flutter_test:
1021
name: platform_interface running analyze and tests
1122
runs-on: ubuntu-latest
1223
steps:
1324
- uses: actions/checkout@v3
25+
with:
26+
ref: ${{ inputs.branch || github.head_ref }}
1427
- uses: actions/setup-java@v1
1528
with:
1629
java-version: "12.x"
@@ -29,6 +42,8 @@ jobs:
2942
runs-on: ubuntu-latest
3043
steps:
3144
- uses: actions/checkout@v3
45+
with:
46+
ref: ${{ inputs.branch || github.head_ref }}
3247
- uses: actions/setup-java@v1
3348
with:
3449
java-version: "12.x"
@@ -50,6 +65,8 @@ jobs:
5065
runs-on: ubuntu-latest
5166
steps:
5267
- uses: actions/checkout@v3
68+
with:
69+
ref: ${{ inputs.branch || github.head_ref }}
5370
- uses: actions/setup-java@v1
5471
with:
5572
java-version: "12.x"
@@ -71,6 +88,8 @@ jobs:
7188
runs-on: ubuntu-latest
7289
steps:
7390
- uses: actions/checkout@v3
91+
with:
92+
ref: ${{ inputs.branch || github.head_ref }}
7493
- uses: actions/setup-java@v1
7594
with:
7695
java-version: "12.x"
@@ -86,6 +105,8 @@ jobs:
86105
runs-on: ubuntu-latest
87106
steps:
88107
- uses: actions/checkout@v3
108+
with:
109+
ref: ${{ inputs.branch || github.head_ref }}
89110
- uses: actions/setup-java@v1
90111
with:
91112
java-version: "12.x"
@@ -125,4 +146,3 @@ jobs:
125146
- run: cd mindbox && flutter pub get
126147
- run: cd mindbox && flutter analyze
127148
- run: cd mindbox && flutter test
128-
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Distribute PushOk (Develop / Mission PR Merge)
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- develop
7+
- mission/*
8+
types:
9+
- closed
10+
11+
jobs:
12+
call-reusable:
13+
if: ${{ github.event.pull_request.merged == true }}
14+
uses: ./.github/workflows/distribute-reusable.yml
15+
with:
16+
branch: ${{ github.base_ref }}
17+
secrets: inherit
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: Distribute PushOk (manual)
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
call-reusable:
8+
uses: ./.github/workflows/distribute-reusable.yml
9+
with:
10+
branch: ${{ github.ref_name }}
11+
secrets: inherit
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Distribute PushOk (Release / Support / Mission PRs)
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- master
7+
- support/*
8+
- mission/*
9+
types:
10+
- opened
11+
- synchronize
12+
13+
jobs:
14+
call-reusable:
15+
if: ${{ startsWith(github.event.pull_request.head.ref, 'release/') }}
16+
uses: ./.github/workflows/distribute-reusable.yml
17+
with:
18+
branch: ${{ github.event.pull_request.head.ref }}
19+
secrets: inherit
Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1-
name: Build application after merge
1+
name: Distribute PushOk - Reusable
22

33
on:
4-
pull_request:
5-
types: [closed]
6-
branches:
7-
- 'feature/*'
8-
- 'develop'
4+
workflow_call:
5+
inputs:
6+
branch:
7+
required: true
8+
type: string
99

1010
jobs:
1111
trigger:
1212
runs-on: macos-latest
13-
if: github.event.pull_request.merged == true
1413
steps:
1514
- name: Checkout repository
1615
uses: actions/checkout@v4
16+
with:
17+
ref: ${{ inputs.branch }}
1718

1819
- name: Get last 3 commit messages
1920
run: |
@@ -23,7 +24,7 @@ jobs:
2324
- name: Trigger build workflow in flutter-app repo
2425
run: |
2526
curl --location 'https://mindbox.gitlab.yandexcloud.net/api/v4/projects/1089/trigger/pipeline' \
26-
--form 'token="${{ secrets.GITLAB_TRIGGER_TOKEN }}"' \
27-
--form 'ref="develop"' \
28-
--form "variables[INPUT_BRANCH]=\"${{ github.head_ref }}\"" \
29-
--form "variables[INPUT_COMMITS]=\"${{ env.commits }}\""
27+
--form "token=${{ secrets.GITLAB_TRIGGER_TOKEN }}" \
28+
--form "ref=develop" \
29+
--form "variables[INPUT_BRANCH]=${{ inputs.branch }}" \
30+
--form "variables[INPUT_COMMITS]=${{ env.commits }}"

0 commit comments

Comments
 (0)