Skip to content

Commit

Permalink
Merge branch 'fastlane:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
m-wayne authored Jul 29, 2024
2 parents f5425e5 + e1ab951 commit c794130
Show file tree
Hide file tree
Showing 75 changed files with 978 additions and 692 deletions.
38 changes: 4 additions & 34 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ aliases:
run:
name: bundle install
command: |
sudo gem update --system `.ci/compatible_gem_version`
gem update --system `.ci/compatible_gem_version`
gem install bundler -v $(cat Gemfile.lock | tail -1 | tr -d " ")
bundle config set --local path .bundle
bundle check || bundle install --jobs=4 --retry=3
Expand Down Expand Up @@ -180,19 +180,6 @@ jobs:
version: << parameters.ruby_version >>
- *bundle_install
- *cache_save_bundler
- run:
name: debug | brew version
command: |
brew -v
- run:
name: brew update if needed # temporary solution for this https://discuss.circleci.com/t/macos-image-users-homebrew-brownout-2021-04-26/39872/2
command: |
# if the version is not 3.x.x, try brew update
ruby -e 'exit(1) if `brew -v` =~ /2\.\d+\.\d+/' ||\
brew update || \
# if brew update fails due to shallow clone, try unshallowing and then brew update again
git -C /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core fetch --unshallow && \
brew update
- run: bundle exec fastlane generate_swift_api

validate_documentation:
Expand Down Expand Up @@ -263,27 +250,10 @@ workflows:
version: 2
"Run Tests & Checks": # Name of the workflow, which ends up displayed on GitHub's PR Check
jobs:
- tests_macos:
name: 'Execute tests on macOS (Xcode 12.5.1, Ruby 2.6)'
xcode_version: '12.5.1'
ruby_version: '2.6.6'
<<: *important-branches
- tests_macos:
name: 'Execute tests on macOS (Xcode 12.5.1, Ruby 2.7)'
xcode_version: '12.5.1'
ruby_version: '2.7.3'
ruby_opt: -W:deprecated
<<: *important-branches
- tests_macos:
name: 'Execute tests on macOS (Xcode 13.4.1, Ruby 3.0)'
xcode_version: '13.4.1'
ruby_version: '3.0.4'
ruby_opt: -W:deprecated
<<: *important-branches
- tests_macos:
name: 'Execute tests on macOS (Xcode 13.4.1, Ruby 3.1)'
xcode_version: '13.4.1'
ruby_version: '3.1.2'
ruby_version: '3.1'
ruby_opt: -W:deprecated
- tests_macos:
name: 'Execute tests on macOS (Xcode 14.3.1, Ruby 3.1)'
Expand Down Expand Up @@ -320,8 +290,8 @@ workflows:
ruby_version: '2.6'
- validate_fastlane_swift_generation:
name: 'Validate Fastlane.swift generation'
xcode_version: '12.5.1'
ruby_version: '2.7'
xcode_version: '15.0.1'
ruby_version: '3.2'
- validate_documentation:
name: 'Validate Documentation'
image: 'cimg/ruby:3.2.2'
Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/create_tag_on_bump_merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Create Tag Version on Bump Merge

on:
pull_request:
types: [closed]

jobs:
version_bump:
if: github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'version-bump-2.221.0-')
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Read gem version
id: read_version
run: |
gemspec_file=$(ls *.gemspec)
version=$(grep -E "spec.version\s*=\s*['\"][0-9]+\.[0-9]+\.[0-9]+['\"]" $gemspec_file | grep -o -E "[0-9]+\.[0-9]+\.[0-9]+")
echo "version=$version" >> $GITHUB_ENV
- name: Create Tag
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git tag -a v${{ env.version }} -m "Version ${{ env.version }}"
git push origin --tags
3 changes: 2 additions & 1 deletion .github/workflows/deploy_to_rubygems.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
release:
types:
- published
workflow_dispatch:

jobs:
deploy-to-rubygems:
Expand All @@ -19,4 +20,4 @@ jobs:
with:
bundler-cache: true
ruby-version: '3.2'
- uses: rubygems/release-gem@v1
- uses: rubygems/release-gem@v1
49 changes: 49 additions & 0 deletions .github/workflows/release_step_1_create_version_bump.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
---
name: Release Step 1 - Create Version Bump

on:
workflow_dispatch:
inputs:
bump_type:
description: 'Bump type'
required: true
type: choice
options:
- patch
- minor
- major

permissions:
contents: write
pull-requests: write

jobs:
create_version_bump:
runs-on: macos-latest

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2

- name: Install fastlane
run: bundle install

- name: Run fastlane bump
run: |
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --global user.name "github-actions[bot]"
bundle exec fastlane bump bump_type:${{ github.event.inputs.bump_type }}
env:
GITHUB_USER_NAME: fastlane # Todo: This is needed for docs - remove somehow
GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Todo: This is needed for docs - remove somehow
GITHUB_API_BEARER: ${{ secrets.GITHUB_TOKEN }}
FL_GITHUB_RELEASE_API_BEARER: ${{ secrets.GITHUB_TOKEN }}
FL_CHANGELOG_SLEEP: 10
FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 180
FASTLANE_XCODEBUILD_SETTINGS_RETRIES: 5

55 changes: 55 additions & 0 deletions .github/workflows/release_step_2_create_github_release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
---
name: Release Step 2 - Create GitHub Release

on:
push:
tags:
- '*'
workflow_dispatch:
inputs:
skip_github_packages:
description: 'Skip pushing to GitHub Packages'
required: true
default: false
type: boolean
skip_rubygems:
description: 'Skip pushing to RubyGems'
required: true
default: false
type: boolean

jobs:
create_github_release:
runs-on: macos-latest

permissions:
contents: write
id-token: write

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.2'

- name: Install fastlane
run: bundle install

- uses: rubygems/[email protected]

- name: Configure GitHub Packages config
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
mkdir -p ~/.gem
echo ":github: Bearer $GITHUB_TOKEN" > ~/.gem/credentials
chmod 0600 ~/.gem/credentials
- name: Run fastlane
env:
FASTLANE_RELEASE_API_BEARER: ${{ secrets.GITHUB_TOKEN }}
run: |
bundle exec fastlane create_github_release skip_github_packages:${{ github.event.inputs.skip_github_packages }} skip_rubygems:${{ github.event.inputs.skip_rubygems }}
7 changes: 7 additions & 0 deletions CHANGELOG.latest.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
* [action][sh] fastlane sh with log set to false should respect a step name (#22151) via Daniel Jankowski (@mollyIV)
* [scan][trainer] hotfix for float-type version acquisition of `xcresulttool version` fails (#22157) via David Dongkyu Kim (@dokimyj)
* [gym] fix default result bundle path name (#22154) via Ignacio Calderon (@kronenthaler)
* [scan][trainer] hotfix for xcresulttool spec changes >= XC16b3 (#22147) via David Dongkyu Kim (@dokimyj)
* [action][ensure_git_status_clean] support empty spaces in `ignore_files` file paths (#21566) via Daniel Jankowski (@mollyIV)
* [spaceship] add visionOS support for Connect API (#22032) via Frederik Seiffert (@triplef)
* [spaceship] Add get app availabilities v2 request (#21901) via Lukasz Grabowski (@lucgrabowski)
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
fastlane (2.220.0)
fastlane (2.222.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand Down
Loading

0 comments on commit c794130

Please sign in to comment.