Skip to content

Commit

Permalink
Merge pull request #75 from payjp/feature/fix-ci
Browse files Browse the repository at this point in the history
CIの修正
  • Loading branch information
yatatsu authored Jul 31, 2024
2 parents 865cc97 + 96fcf5d commit 47ad3fd
Show file tree
Hide file tree
Showing 13 changed files with 275 additions and 206 deletions.
14 changes: 4 additions & 10 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,16 @@ env:

jobs:
build:
runs-on: macos-10.15
runs-on: macos-14
timeout-minutes: 30
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install HomeBrew
run: |
brew bundle || true
cat Brewfile.lock.json || true
- name: Select Xcode
run: sudo xcode-select -s '/Applications/Xcode_12.2.app/Contents/Developer'
- run: xcodebuild -version
- uses: actions/cache@v2
- uses: actions/cache@v4
with:
path: vendor/bundle
key: ${{ runner.os }}-gems-${{ env.CACHE_NUMBER }}-${{ hashFiles('**/Gemfile.lock') }}
Expand All @@ -34,7 +32,7 @@ jobs:
bundle config set deployment 'true'
bundle config set clean 'true'
bundle install --jobs 4 --retry 3
- uses: actions/cache@v2
- uses: actions/cache@v4
with:
path: Carthage
key: ${{ runner.os }}-carthage-${{ env.CACHE_NUMBER }}-${{ hashFiles('Cartfile.resolved') }}
Expand All @@ -48,7 +46,3 @@ jobs:
- run: bundle exec fastlane ios build_swiftpm
- run: bundle exec fastlane ios build_carthage_swift_example
- run: bundle exec fastlane ios build_cocoapods_objc_example




8 changes: 1 addition & 7 deletions .github/workflows/update-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,14 @@ on:

jobs:
build:
runs-on: macos-10.15
runs-on: macos-14
timeout-minutes: 30
steps:
- uses: actions/checkout@v2
- name: Install HomeBrew
run: |
brew bundle || true
cat Brewfile.lock.json || true
- name: Select Xcode
run: sudo xcode-select -s '/Applications/Xcode_12.1.app/Contents/Developer'
- run: xcodebuild -version
- uses: actions/cache@v2
with:
Expand All @@ -33,7 +31,3 @@ jobs:
- run: bundle exec fastlane ios create_pr_to_update_docs
env:
GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}




3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ gem "danger-swiftlint"
gem "jazzy"
gem "cocoapods"
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
eval_gemfile(plugins_path) if File.exist?(plugins_path)
# workaround for https://github.com/dependabot/dependabot-core/issues/1720
eval_gemfile('fastlane/Pluginfile') if File.exist?(plugins_path)
Loading

0 comments on commit 47ad3fd

Please sign in to comment.