Skip to content

Commit 4e35486

Browse files
committed
Merge branch 'main' into feature/JIRA-automatization
# Conflicts: # .github/workflows/ios-selfhosted-nightly-build.yml
2 parents 4b1f040 + e93e4ab commit 4e35486

File tree

5 files changed

+69
-53
lines changed

5 files changed

+69
-53
lines changed

.github/actions/universal-detect-changes-and-generate-changelog/action.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ inputs:
1919
cache_key_prefix:
2020
required: false
2121
description: 'Custom prefix for cache keys. If not provided, will use latest_builded_commit-. If provided, format will be {prefix}-latest_builded_commit-'
22+
use_git_lfs:
23+
required: false
24+
description: 'Whether to download Git-LFS files during checkout. Default is false.'
25+
type: boolean
26+
default: false
2227

2328
outputs:
2429
skip_build:
@@ -41,6 +46,7 @@ runs:
4146
uses: actions/checkout@v4
4247
with:
4348
fetch-depth: ${{ inputs.checkout_depth }}
49+
lfs: ${{ inputs.use_git_lfs }}
4450

4551
- name: Calculate cache keys
4652
id: cache_keys

.github/workflows/ios-selfhosted-build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ jobs:
7070
runner_label: ${{ inputs.runner_label }}
7171
timeout_minutes: ${{ inputs.timeout_minutes }}
7272
xcconfig_path: ${{ inputs.xcconfig_path }}
73-
secret_properties: ${{ inputs.secret_properties }}
7473
required_keys: ${{ inputs.required_keys }}
7574
changelog_fallback_lookback: ${{ inputs.changelog_fallback_lookback }}
7675
secrets:

.github/workflows/ios-selfhosted-nightly-build.yml

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,7 @@ name: iOS Self-hosted Nightly Build
33
on:
44
workflow_call:
55
inputs:
6-
use_git_lfs:
7-
description: 'Whether to download Git-LFS files.'
8-
type: boolean
9-
default: false
10-
custom_values:
11-
description: 'Custom string that can contains values specified in your workflow file. Those values will be placed into environment variable. Example: "CUSTOM-1: 1; CUSTOM-2: 2"'
12-
type: string
13-
required: false
6+
# General
147
runner_label:
158
description: 'The custom label for the self-hosted runner to use for the build job.'
169
type: string
@@ -19,20 +12,34 @@ on:
1912
description: 'Job timeout in minutes'
2013
type: number
2114
default: 30
22-
xcconfig_path:
23-
description: 'Path to the .xcconfig file. Selected secret properties will be appended to the end of this file.'
15+
# Changelog
16+
checkout_depth:
17+
description: 'The depth of the git history to fetch for changelog generation.'
18+
type: number
19+
required: false
20+
default: 100
21+
changelog_fallback_lookback:
22+
description: 'The amount of time to look back for merge commits when no previous build commit is found. Default is 24 hours.'
2423
type: string
2524
required: false
26-
secret_properties:
27-
description: 'Secrets in the format KEY = VALUE (one per line).'
25+
default: '24 hours'
26+
# Git LFS
27+
use_git_lfs:
28+
description: 'Whether to download Git-LFS files.'
29+
type: boolean
30+
default: false
31+
# Export secrets
32+
xcconfig_path:
33+
description: 'Path to the .xcconfig file. Selected secret properties will be appended to the end of this file.'
2834
type: string
2935
required: false
3036
required_keys:
3137
description: 'Comma-separated list of required keys.'
3238
type: string
3339
required: false
34-
changelog_fallback_lookback:
35-
description: 'The amount of time to look back for merge commits when no previous build commit is found. Default is 24 hours.'
40+
# Custom values
41+
custom_values:
42+
description: 'Custom string that can contains values specified in your workflow file. Those values will be placed into environment variable. Example: "CUSTOM-1: 1; CUSTOM-2: 2"'
3643
type: string
3744
required: false
3845
default: '24 hours'
@@ -75,13 +82,9 @@ jobs:
7582
id: detect_changes
7683
uses: futuredapp/.github/.github/actions/universal-detect-changes-and-generate-changelog@main
7784
with:
85+
checkout_depth: ${{ inputs.checkout_depth }}
7886
fallback_lookback: ${{ inputs.changelog_fallback_lookback }}
79-
80-
- name: Checkout
81-
if: ${{ steps.detect_changes.outputs.skip_build == 'false' && inputs.use_git_lfs == 'true' }}
82-
uses: actions/checkout@v4
83-
with:
84-
lfs: ${{ inputs.use_git_lfs }}
87+
use_git_lfs: ${{ inputs.use_git_lfs }}
8588

8689
- name: Set changelog
8790
if: ${{ steps.detect_changes.outputs.skip_build == 'false' }}

.github/workflows/ios-selfhosted-on-demand-build.yml

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,7 @@ name: iOS Self-hosted On-Demand Build
33
on:
44
workflow_call:
55
inputs:
6-
use_git_lfs:
7-
description: 'Whether to download Git-LFS files.'
8-
type: boolean
9-
default: false
10-
custom_values:
11-
description: 'Custom string that can contains values specified in your workflow file. Those values will be placed into environment variable. Example: "CUSTOM-1: 1; CUSTOM-2: 2"'
12-
type: string
13-
required: false
6+
# General
147
runner_label:
158
description: 'The custom label for the self-hosted runner to use for the build job.'
169
type: string
@@ -19,27 +12,40 @@ on:
1912
description: 'Job timeout in minutes'
2013
type: number
2114
default: 30
22-
xcconfig_path:
23-
description: 'Path to the .xcconfig file. Selected secret properties will be appended to the end of this file.'
15+
# Changelog
16+
changelog:
17+
description: 'Will be used as TestFlight changelog'
2418
type: string
2519
required: false
26-
secret_properties:
27-
description: 'Secrets in the format KEY = VALUE (one per line).'
20+
checkout_depth:
21+
description: 'The depth of the git history to fetch for changelog generation.'
22+
type: number
23+
required: false
24+
default: 100
25+
changelog_fallback_lookback:
26+
description: 'The amount of time to look back for merge commits when no previous build commit is found. Default is 24 hours.'
2827
type: string
2928
required: false
30-
required_keys:
31-
description: 'Comma-separated list of required keys.'
29+
default: '24 hours'
30+
# Git LFS
31+
use_git_lfs:
32+
description: 'Whether to download Git-LFS files.'
33+
type: boolean
34+
default: false
35+
# Export secrets
36+
xcconfig_path:
37+
description: 'Path to the .xcconfig file. Selected secret properties will be appended to the end of this file.'
3238
type: string
3339
required: false
34-
changelog:
35-
description: 'Will be used as TestFlight changelog'
40+
required_keys:
41+
description: 'Comma-separated list of required keys.'
3642
type: string
3743
required: false
38-
changelog_fallback_lookback:
39-
description: 'The amount of time to look back for merge commits when no previous build commit is found. Default is 24 hours.'
44+
# Custom values
45+
custom_values:
46+
description: 'Custom string that can contains values specified in your workflow file. Those values will be placed into environment variable. Example: "CUSTOM-1: 1; CUSTOM-2: 2"'
4047
type: string
4148
required: false
42-
default: '24 hours'
4349

4450
secrets:
4551
MATCH_PASSWORD:
@@ -69,10 +75,12 @@ jobs:
6975
id: detect_changes
7076
uses: futuredapp/.github/.github/actions/universal-detect-changes-and-generate-changelog@main
7177
with:
78+
checkout_depth: ${{ inputs.checkout_depth }}
7279
fallback_lookback: ${{ inputs.changelog_fallback_lookback }}
80+
use_git_lfs: ${{ inputs.use_git_lfs }}
7381

7482
- name: Checkout
75-
if: ${{ inputs.use_git_lfs == 'true' || inputs.changelog != '' }}
83+
if: ${{ inputs.changelog != '' }}
7684
uses: actions/checkout@v4
7785
with:
7886
lfs: ${{ inputs.use_git_lfs }}

.github/workflows/ios-selfhosted-release.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,7 @@ name: iOS Self-hosted Release
33
on:
44
workflow_call:
55
inputs:
6-
use_git_lfs:
7-
description: 'Whether to download Git-LFS files.'
8-
type: boolean
9-
default: false
10-
custom_values:
11-
description: 'Custom string that can contains values specified in your workflow file. Those values will be placed into environment variable. Example: "CUSTOM-1: 1; CUSTOM-2: 2"'
12-
type: string
13-
required: false
6+
# General
147
runner_label:
158
description: 'The custom label for the self-hosted runner to use for the build job.'
169
type: string
@@ -19,18 +12,25 @@ on:
1912
description: 'Job timeout in minutes'
2013
type: number
2114
default: 30
15+
# Git LFS
16+
use_git_lfs:
17+
description: 'Whether to download Git-LFS files.'
18+
type: boolean
19+
default: false
20+
# Export secrets
2221
xcconfig_path:
2322
description: 'Path to the .xcconfig file. Selected secret properties will be appended to the end of this file.'
2423
type: string
2524
required: false
26-
secret_properties:
27-
description: 'Secrets in the format KEY = VALUE (one per line).'
28-
type: string
29-
required: false
3025
required_keys:
3126
description: 'Comma-separated list of required keys.'
3227
type: string
3328
required: false
29+
# Custom values
30+
custom_values:
31+
description: 'Custom string that can contains values specified in your workflow file. Those values will be placed into environment variable. Example: "CUSTOM-1: 1; CUSTOM-2: 2"'
32+
type: string
33+
required: false
3434

3535
secrets:
3636
MATCH_PASSWORD:

0 commit comments

Comments
 (0)