From c1b53bdf676fce3f1db83e00cd3c2183be814d29 Mon Sep 17 00:00:00 2001 From: Diogo Autilio Date: Sun, 30 Nov 2025 08:16:23 -0300 Subject: [PATCH 1/3] chore(ci) : Update macOS to 15 and Xcode to 26.1 --- .github/scripts/build_app.sh | 2 +- .github/workflows/Build.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/scripts/build_app.sh b/.github/scripts/build_app.sh index 14ce85d..8268274 100755 --- a/.github/scripts/build_app.sh +++ b/.github/scripts/build_app.sh @@ -4,5 +4,5 @@ set -eo pipefail xcodebuild -project SCLAlertView.xcodeproj \ -scheme SCLAlertView \ - -destination platform=iOS\ Simulator,OS=17.2,name=iPhone\ 15 \ + -destination platform=iOS\ Simulator,OS=26.1,name=iPhone\ 16 \ clean build | xcpretty diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 94a64be..dc85dee 100755 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: build: name: Building SCLAlertView - runs-on: macos-13 + runs-on: macos-15 steps: - name: Checkout repository uses: actions/checkout@v4 @@ -12,7 +12,7 @@ jobs: - name: Setup Xcode version uses: maxim-lobanov/setup-xcode@v1.6.0 with: - xcode-version: 15.0.1 + xcode-version: 26.1 - name: Install Project Tools uses: jdx/mise-action@v3 From 5464e331ae26297c500cfe71cb0a31122ba5aac0 Mon Sep 17 00:00:00 2001 From: Diogo Autilio Date: Sun, 30 Nov 2025 08:22:07 -0300 Subject: [PATCH 2/3] Replace mise-action with ruby/setup-ruby, which uses precompiled binaries and is faster than building from source. --- .github/workflows/Build.yml | 7 ++++--- Gemfile.lock | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index dc85dee..274862a 100755 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -14,10 +14,11 @@ jobs: with: xcode-version: 26.1 - - name: Install Project Tools - uses: jdx/mise-action@v3 + - name: Setup Ruby + uses: ruby/setup-ruby@v1 with: - experimental: true + ruby-version: 3.1.2 + bundler-cache: true - name: Building iOS app run: exec ./.github/scripts/build_app.sh diff --git a/Gemfile.lock b/Gemfile.lock index fe58e35..dba6404 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -71,6 +71,7 @@ GEM escape (0.0.4) ethon (0.15.0) ffi (>= 1.15.0) + ffi (1.17.2-arm64-darwin) ffi (1.17.2-x86_64-darwin) fourflusher (2.3.1) fuzzy_match (2.0.4) @@ -105,6 +106,7 @@ GEM rexml (>= 3.3.6, < 4.0) PLATFORMS + arm64-darwin-22 x86_64-darwin-23 DEPENDENCIES From 0540be42283cf96f5af52ffc624ac1f09ce1cb26 Mon Sep 17 00:00:00 2001 From: Diogo Autilio Date: Sun, 30 Nov 2025 08:32:58 -0300 Subject: [PATCH 3/3] chore(ci): update building system --- .github/scripts/build_app.sh | 8 -------- .github/workflows/Build.yml | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 10 deletions(-) delete mode 100755 .github/scripts/build_app.sh diff --git a/.github/scripts/build_app.sh b/.github/scripts/build_app.sh deleted file mode 100755 index 8268274..0000000 --- a/.github/scripts/build_app.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -set -eo pipefail - -xcodebuild -project SCLAlertView.xcodeproj \ - -scheme SCLAlertView \ - -destination platform=iOS\ Simulator,OS=26.1,name=iPhone\ 16 \ - clean build | xcpretty diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 274862a..7d2e635 100755 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -5,6 +5,14 @@ jobs: build: name: Building SCLAlertView runs-on: macos-15 + strategy: + matrix: + scheme: [ + SCLAlertView + ] + destination: [ + 'platform=iOS Simulator,name=iPhone 16,OS=26.1' + ] steps: - name: Checkout repository uses: actions/checkout@v4 @@ -20,5 +28,9 @@ jobs: ruby-version: 3.1.2 bundler-cache: true - - name: Building iOS app - run: exec ./.github/scripts/build_app.sh + - name: Building ${{ matrix.scheme }} on ${{ matrix.destination }} + run: | + set -o pipefail && xcodebuild -project SCLAlertView.xcodeproj \ + -scheme ${{ matrix.scheme }} \ + -destination '${{ matrix.destination }}' \ + clean build | xcbeautify --renderer github-actions