Skip to content

Commit

Permalink
Update CI execution environment (#28)
Browse files Browse the repository at this point in the history
* Update Danger execution environment to macOS13

* Update swift build execution environment to macOS13

* Update xcode build execution environment to macOS13

* Update minimum deployment target to macOS 10.13

* Update dependency gems

* Update Screeen.framework v2.1.0
  • Loading branch information
Econa77 authored Oct 13, 2023
1 parent 988b75d commit afc7aa9
Show file tree
Hide file tree
Showing 12 changed files with 98 additions and 135 deletions.
68 changes: 21 additions & 47 deletions .github/workflows/Danger.yml
Original file line number Diff line number Diff line change
@@ -1,67 +1,41 @@
name: Danger

on: pull_request

on:
pull_request:
push:
branches:
- master
jobs:
danger:

runs-on: macos-11

runs-on: macos-13
# https://github.com/danger/danger/issues/1103
if: (github.event.pull_request.head.repo.fork == false)
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0

- name: Setup ruby
uses: actions/setup-ruby@v1
uses: ruby/setup-ruby@v1
with:
ruby-version: '2.6'

- name: Select Xcode
run: sudo xcode-select -s /Applications/Xcode_13.2.1.app

- name: Cache RubyGems
uses: actions/cache@v1
ruby-version: '3.2'
bundler-cache: true
- name: Cache Mint
uses: actions/cache@v3
with:
path: vendor/bundle
key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
path: .mint
key: ${{ runner.os }}-mint-${{ env.SWIFTLINT_VERSION }}
restore-keys: |
${{ runner.os }}-gem-
- name: Cache Mint Builds
uses: actions/cache@v1
with:
path: ${{ env.MINT_PATH }}
key: ${{ runner.os }}-mint-build-${{ env.SWIFTLINT_VERSION }}
restore-keys: |
${{ runner.os }}-mint-build-
- name: Cache Mint Links
uses: actions/cache@v1
with:
path: ${{ env.MINT_LINK_PATH }}
key: ${{ runner.os }}-mint-link-${{ env.SWIFTLINT_VERSION }}
restore-keys: |
${{ runner.os }}-mint-link-
- name: Bundle install
run: |
gem install bundler
bundle config path vendor/bundle
bundle install --jobs 4 --retry 3
${{ runner.os }}-mint-
- name: Install Mint and Packages
run: |
brew install mint
mint install realm/SwiftLint@${{ env.SWIFTLINT_VERSION }}
- name: Run Danger
run: bundle exec danger
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

env:
MINT_PATH: ${{ github.workspace }}/mint
MINT_LINK_PATH: ${{ github.workspace }}/mint/bin
SWIFTLINT_VERSION: 0.39.1
MINT_PATH: .mint/lib
MINT_LINK_PATH: .mint/bin
SWIFTLINT_VERSION: 0.53.0
DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer
10 changes: 5 additions & 5 deletions .github/workflows/Swift-Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-10.15, macos-11]
xcode: [12.4, 13.2.1]
os: [macos-12, macos-13]
xcode: ['14.2', '15.0']
exclude:
- os: macos-10.15
xcode: 13.2.1
- os: macos-12
xcode: '15.0'
env:
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Build and Test
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/Xcode-Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-10.15, macos-11]
xcode: [12.4, 13.2.1]
os: [macos-12, macos-13]
xcode: ['14.2', '15.0']
exclude:
- os: macos-10.15
xcode: 13.2.1
- os: macos-12
xcode: '15.0'
env:
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Build and Test
Expand All @@ -23,11 +23,9 @@ jobs:
-workspace "$PROJECT" \
-scheme "$SCHEME" \
-sdk "$SDK" \
-destination "$DESTINATION" \
-configuration Debug \
ENABLE_TESTABILITY=YES | xcpretty -c;
env:
PROJECT: RxScreeen.xcworkspace
SCHEME: RxScreeen
SDK: macosx
DESTINATION: arch=x86_64
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "Clipy/Screeen" "v2.0.1"
github "ReactiveX/RxSwift" "6.5.0"
github "Clipy/Screeen" "v2.1.0"
github "ReactiveX/RxSwift" "6.6.0"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/RxSwift
Submodule RxSwift updated 147 files
2 changes: 1 addition & 1 deletion Dangerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github.dismiss_out_of_range_messages
swiftlint.config_file = '.swiftlint.yml'
swiftlint.binary_path = './mint/bin/swiftlint'
swiftlint.binary_path = '.mint/bin/swiftlint'
swiftlint.lint_files(inline_mode: true)
4 changes: 2 additions & 2 deletions Example/Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
Expand Down Expand Up @@ -496,7 +496,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand Down
117 changes: 54 additions & 63 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,45 +1,51 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.5)
CFPropertyList (3.0.6)
rexml
activesupport (6.1.4.6)
activesupport (7.1.1)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
base64 (0.1.1)
bigdecimal (3.1.4)
claide (1.1.0)
claide-plugins (0.9.2)
cork
nap
open4 (~> 1.3)
cocoapods (1.11.2)
cocoapods (1.13.0)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.11.2)
cocoapods-core (= 1.13.0)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-downloader (>= 1.6.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.4.0, < 2.0)
cocoapods-trunk (>= 1.6.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (>= 1.0, < 3.0)
xcodeproj (>= 1.21.0, < 2.0)
cocoapods-core (1.11.2)
activesupport (>= 5.0, < 7)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.23.0, < 2.0)
cocoapods-core (1.13.0)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
Expand All @@ -49,7 +55,7 @@ GEM
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (1.5.1)
cocoapods-downloader (1.6.3)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
Expand All @@ -58,104 +64,89 @@ GEM
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.1.9)
concurrent-ruby (1.2.2)
connection_pool (2.4.1)
cork (0.3.0)
colored2 (~> 3.1)
danger (8.4.2)
danger (9.3.2)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored2 (~> 3.1)
cork (~> 0.1)
faraday (>= 0.9.0, < 2.0)
faraday (>= 0.9.0, < 3.0)
faraday-http-cache (~> 2.0)
git (~> 1.7)
git (~> 1.13)
kramdown (~> 2.3)
kramdown-parser-gfm (~> 1.0)
no_proxy_fix
octokit (~> 4.7)
octokit (~> 6.0)
terminal-table (>= 1, < 4)
danger-swiftlint (0.29.4)
danger-swiftlint (0.33.0)
danger
rake (> 10)
thor (~> 0.19)
drb (2.1.1)
ruby2_keywords
escape (0.0.4)
ethon (0.15.0)
ethon (0.16.0)
ffi (>= 1.15.0)
faraday (1.9.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0)
faraday-multipart (~> 1.0)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.0)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
faraday-retry (~> 1.0)
faraday (2.7.11)
base64
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-http-cache (2.2.0)
faraday-http-cache (2.5.0)
faraday (>= 0.8)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.3)
multipart-post (>= 1.2, < 3)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
ffi (1.15.5)
faraday-net_http (3.0.2)
ffi (1.16.3)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
git (1.11.0)
git (1.18.0)
addressable (~> 2.8)
rchardet (~> 1.8)
httpclient (2.8.3)
i18n (1.9.1)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
json (2.6.1)
kramdown (2.3.1)
json (2.6.3)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
minitest (5.15.0)
minitest (5.20.0)
molinillo (0.8.0)
multipart-post (2.1.1)
mutex_m (0.1.2)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
no_proxy_fix (0.1.2)
octokit (4.22.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
octokit (6.1.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
open4 (1.3.4)
public_suffix (4.0.6)
public_suffix (4.0.7)
rake (13.0.6)
rchardet (1.8.0)
rexml (3.2.5)
rexml (3.2.6)
ruby-macho (2.5.1)
ruby2_keywords (0.0.5)
sawyer (0.8.2)
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
faraday (>= 0.17.3, < 3)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thor (0.20.3)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (2.0.4)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.1.0)
xcodeproj (1.21.0)
unicode-display_width (2.5.0)
xcodeproj (1.23.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
zeitwerk (2.5.4)

PLATFORMS
ruby
Expand All @@ -166,4 +157,4 @@ DEPENDENCIES
danger-swiftlint

BUNDLED WITH
2.1.4
2.4.20
Loading

0 comments on commit afc7aa9

Please sign in to comment.