Skip to content

Commit c794130

Browse files
authored
Merge branch 'fastlane:master' into master
2 parents f5425e5 + e1ab951 commit c794130

File tree

75 files changed

+978
-692
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+978
-692
lines changed

.circleci/config.yml

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ aliases:
5555
run:
5656
name: bundle install
5757
command: |
58-
sudo gem update --system `.ci/compatible_gem_version`
58+
gem update --system `.ci/compatible_gem_version`
5959
gem install bundler -v $(cat Gemfile.lock | tail -1 | tr -d " ")
6060
bundle config set --local path .bundle
6161
bundle check || bundle install --jobs=4 --retry=3
@@ -180,19 +180,6 @@ jobs:
180180
version: << parameters.ruby_version >>
181181
- *bundle_install
182182
- *cache_save_bundler
183-
- run:
184-
name: debug | brew version
185-
command: |
186-
brew -v
187-
- run:
188-
name: brew update if needed # temporary solution for this https://discuss.circleci.com/t/macos-image-users-homebrew-brownout-2021-04-26/39872/2
189-
command: |
190-
# if the version is not 3.x.x, try brew update
191-
ruby -e 'exit(1) if `brew -v` =~ /2\.\d+\.\d+/' ||\
192-
brew update || \
193-
# if brew update fails due to shallow clone, try unshallowing and then brew update again
194-
git -C /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core fetch --unshallow && \
195-
brew update
196183
- run: bundle exec fastlane generate_swift_api
197184

198185
validate_documentation:
@@ -263,27 +250,10 @@ workflows:
263250
version: 2
264251
"Run Tests & Checks": # Name of the workflow, which ends up displayed on GitHub's PR Check
265252
jobs:
266-
- tests_macos:
267-
name: 'Execute tests on macOS (Xcode 12.5.1, Ruby 2.6)'
268-
xcode_version: '12.5.1'
269-
ruby_version: '2.6.6'
270-
<<: *important-branches
271-
- tests_macos:
272-
name: 'Execute tests on macOS (Xcode 12.5.1, Ruby 2.7)'
273-
xcode_version: '12.5.1'
274-
ruby_version: '2.7.3'
275-
ruby_opt: -W:deprecated
276-
<<: *important-branches
277-
- tests_macos:
278-
name: 'Execute tests on macOS (Xcode 13.4.1, Ruby 3.0)'
279-
xcode_version: '13.4.1'
280-
ruby_version: '3.0.4'
281-
ruby_opt: -W:deprecated
282-
<<: *important-branches
283253
- tests_macos:
284254
name: 'Execute tests on macOS (Xcode 13.4.1, Ruby 3.1)'
285255
xcode_version: '13.4.1'
286-
ruby_version: '3.1.2'
256+
ruby_version: '3.1'
287257
ruby_opt: -W:deprecated
288258
- tests_macos:
289259
name: 'Execute tests on macOS (Xcode 14.3.1, Ruby 3.1)'
@@ -320,8 +290,8 @@ workflows:
320290
ruby_version: '2.6'
321291
- validate_fastlane_swift_generation:
322292
name: 'Validate Fastlane.swift generation'
323-
xcode_version: '12.5.1'
324-
ruby_version: '2.7'
293+
xcode_version: '15.0.1'
294+
ruby_version: '3.2'
325295
- validate_documentation:
326296
name: 'Validate Documentation'
327297
image: 'cimg/ruby:3.2.2'
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Create Tag Version on Bump Merge
2+
3+
on:
4+
pull_request:
5+
types: [closed]
6+
7+
jobs:
8+
version_bump:
9+
if: github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'version-bump-2.221.0-')
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- name: Checkout code
14+
uses: actions/checkout@v2
15+
16+
- name: Read gem version
17+
id: read_version
18+
run: |
19+
gemspec_file=$(ls *.gemspec)
20+
version=$(grep -E "spec.version\s*=\s*['\"][0-9]+\.[0-9]+\.[0-9]+['\"]" $gemspec_file | grep -o -E "[0-9]+\.[0-9]+\.[0-9]+")
21+
echo "version=$version" >> $GITHUB_ENV
22+
23+
- name: Create Tag
24+
env:
25+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26+
run: |
27+
git tag -a v${{ env.version }} -m "Version ${{ env.version }}"
28+
git push origin --tags

.github/workflows/deploy_to_rubygems.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
release:
55
types:
66
- published
7+
workflow_dispatch:
78

89
jobs:
910
deploy-to-rubygems:
@@ -19,4 +20,4 @@ jobs:
1920
with:
2021
bundler-cache: true
2122
ruby-version: '3.2'
22-
- uses: rubygems/release-gem@v1
23+
- uses: rubygems/release-gem@v1
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
---
2+
name: Release Step 1 - Create Version Bump
3+
4+
on:
5+
workflow_dispatch:
6+
inputs:
7+
bump_type:
8+
description: 'Bump type'
9+
required: true
10+
type: choice
11+
options:
12+
- patch
13+
- minor
14+
- major
15+
16+
permissions:
17+
contents: write
18+
pull-requests: write
19+
20+
jobs:
21+
create_version_bump:
22+
runs-on: macos-latest
23+
24+
steps:
25+
- name: Checkout repository
26+
uses: actions/checkout@v3
27+
28+
- name: Set up Ruby
29+
uses: ruby/setup-ruby@v1
30+
with:
31+
ruby-version: 3.2
32+
33+
- name: Install fastlane
34+
run: bundle install
35+
36+
- name: Run fastlane bump
37+
run: |
38+
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
39+
git config --global user.name "github-actions[bot]"
40+
bundle exec fastlane bump bump_type:${{ github.event.inputs.bump_type }}
41+
env:
42+
GITHUB_USER_NAME: fastlane # Todo: This is needed for docs - remove somehow
43+
GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Todo: This is needed for docs - remove somehow
44+
GITHUB_API_BEARER: ${{ secrets.GITHUB_TOKEN }}
45+
FL_GITHUB_RELEASE_API_BEARER: ${{ secrets.GITHUB_TOKEN }}
46+
FL_CHANGELOG_SLEEP: 10
47+
FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 180
48+
FASTLANE_XCODEBUILD_SETTINGS_RETRIES: 5
49+
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
---
2+
name: Release Step 2 - Create GitHub Release
3+
4+
on:
5+
push:
6+
tags:
7+
- '*'
8+
workflow_dispatch:
9+
inputs:
10+
skip_github_packages:
11+
description: 'Skip pushing to GitHub Packages'
12+
required: true
13+
default: false
14+
type: boolean
15+
skip_rubygems:
16+
description: 'Skip pushing to RubyGems'
17+
required: true
18+
default: false
19+
type: boolean
20+
21+
jobs:
22+
create_github_release:
23+
runs-on: macos-latest
24+
25+
permissions:
26+
contents: write
27+
id-token: write
28+
29+
steps:
30+
- name: Checkout repository
31+
uses: actions/checkout@v3
32+
33+
- name: Set up Ruby
34+
uses: ruby/setup-ruby@v1
35+
with:
36+
ruby-version: '3.2'
37+
38+
- name: Install fastlane
39+
run: bundle install
40+
41+
- uses: rubygems/configure-rubygems-credentials@v1.0.0
42+
43+
- name: Configure GitHub Packages config
44+
env:
45+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
46+
run: |
47+
mkdir -p ~/.gem
48+
echo ":github: Bearer $GITHUB_TOKEN" > ~/.gem/credentials
49+
chmod 0600 ~/.gem/credentials
50+
51+
- name: Run fastlane
52+
env:
53+
FASTLANE_RELEASE_API_BEARER: ${{ secrets.GITHUB_TOKEN }}
54+
run: |
55+
bundle exec fastlane create_github_release skip_github_packages:${{ github.event.inputs.skip_github_packages }} skip_rubygems:${{ github.event.inputs.skip_rubygems }}

CHANGELOG.latest.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
* [action][sh] fastlane sh with log set to false should respect a step name (#22151) via Daniel Jankowski (@mollyIV)
2+
* [scan][trainer] hotfix for float-type version acquisition of `xcresulttool version` fails (#22157) via David Dongkyu Kim (@dokimyj)
3+
* [gym] fix default result bundle path name (#22154) via Ignacio Calderon (@kronenthaler)
4+
* [scan][trainer] hotfix for xcresulttool spec changes >= XC16b3 (#22147) via David Dongkyu Kim (@dokimyj)
5+
* [action][ensure_git_status_clean] support empty spaces in `ignore_files` file paths (#21566) via Daniel Jankowski (@mollyIV)
6+
* [spaceship] add visionOS support for Connect API (#22032) via Frederik Seiffert (@triplef)
7+
* [spaceship] Add get app availabilities v2 request (#21901) via Lukasz Grabowski (@lucgrabowski)

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
fastlane (2.220.0)
4+
fastlane (2.222.0)
55
CFPropertyList (>= 2.3, < 4.0.0)
66
addressable (>= 2.8, < 3.0.0)
77
artifactory (~> 3.0)

0 commit comments

Comments
 (0)