diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 8950835..3cd3ad7 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -3,43 +3,43 @@ on: [pull_request] jobs: build: - runs-on: macOS-26 steps: - - uses: actions/checkout@v6 - - - name: Read Xcode version - id: xcode_version - run: echo "XCODE_VERSION=$(cat .xcode-version)" >> $GITHUB_ENV - - - uses: maxim-lobanov/setup-xcode@v1.6.0 - with: - xcode-version: ${{ env.XCODE_VERSION }} - - - name: Bundle install - run: bundle install - - - name: Run iOS tests - run: make test-ios - - - name: Run macOS tests - run: make test-macos - - - name: Danger action - uses: MeilCli/danger-action@v6.0.42 - if: github.event_name == 'pull_request' - with: - plugins_file: 'Gemfile' - install_path: 'vendor/bundle' - danger_file: 'Dangerfile' - danger_id: 'danger-pr' - env: - DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v5 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - with: - verbose: true + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 + + - name: Read Xcode version + id: xcode_version + run: echo "XCODE_VERSION=$(cat .xcode-version)" >> $GITHUB_ENV + + - name: Setup Xcode using .xcode-version + uses: maxim-lobanov/setup-xcode@7f352e61cbe8130c957c3bc898c4fb025784ea1e + with: + xcode-version: ${{ env.XCODE_VERSION }} + + - name: Bundle install + run: bundle install + + - name: Run iOS tests + run: make test-ios + + - name: Run macOS tests + run: make test-macos + + - name: Danger action + uses: MeilCli/danger-action@18eeddb07f870572eeae9edb0dd5a4196d93eb64 + if: github.event_name == 'pull_request' + with: + plugins_file: 'Gemfile' + install_path: 'vendor/bundle' + danger_file: 'Dangerfile' + danger_id: 'danger-pr' + env: + DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Upload coverage to Codecov + uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + with: + verbose: true diff --git a/.mergify.yml b/.mergify.yml deleted file mode 100644 index 91e6cf5..0000000 --- a/.mergify.yml +++ /dev/null @@ -1,28 +0,0 @@ -# Adapted from https://doc.mergify.io/examples.html#running-ci-pipelines-automatically -# Validate your changes with: -# $ curl -F 'data=@.mergify.yml' https://gh.mergify.io/validate/ - -pull_request_rules: - - name: Automatic merges for Dependabot pull requests - conditions: - - author~=^dependabot(|-preview)\[bot\]$ - - check-success=build - actions: - merge: - method: squash - - - name: Automatic merges for Renovate pull requests - conditions: - - author~=^renovate\[bot\]$ - - check-success=build - actions: - merge: - method: squash - - - name: Automatic merges for joaolfp pull requests - conditions: - - author=joaolfp - - check-success=build - actions: - merge: - method: squash diff --git a/.xcode-version b/.xcode-version index 3fd5462..478ecee 100644 --- a/.xcode-version +++ b/.xcode-version @@ -1 +1 @@ -26.0.1 \ No newline at end of file +26.1.1 \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 2af6e5f..51a8107 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,10 +13,10 @@ GEM minitest (>= 5.1) securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) + addressable (2.8.8) + public_suffix (>= 2.0.2, < 8.0) base64 (0.3.0) - benchmark (0.4.1) + benchmark (0.5.0) bigdecimal (3.3.1) claide (1.1.0) claide-plugins (0.9.2) @@ -24,8 +24,8 @@ GEM nap open4 (~> 1.3) colored2 (3.1.2) - concurrent-ruby (1.3.5) - connection_pool (2.5.4) + concurrent-ruby (1.3.6) + connection_pool (2.5.5) cork (0.3.0) colored2 (~> 3.1) danger (9.5.3) @@ -42,7 +42,7 @@ GEM octokit (>= 4.0) pstore (~> 0.1) terminal-table (>= 1, < 5) - danger-swiftlint (0.37.3) + danger-swiftlint (0.37.4) danger rake (> 10) thor (~> 1.4) @@ -53,8 +53,8 @@ GEM logger faraday-http-cache (2.5.1) faraday (>= 0.8) - faraday-net_http (3.4.1) - net-http (>= 0.5.0) + faraday-net_http (3.4.2) + net-http (~> 0.5) git (2.3.3) activesupport (>= 5.0) addressable (~> 2.8) @@ -62,16 +62,16 @@ GEM rchardet (~> 1.8) i18n (1.14.7) concurrent-ruby (~> 1.0) - json (2.15.2) + json (2.18.0) kramdown (2.5.1) rexml (>= 3.3.9) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) logger (1.7.0) - minitest (5.25.5) + minitest (5.27.0) nap (1.1.0) - net-http (0.6.0) - uri + net-http (0.8.0) + uri (>= 0.11.1) octokit (10.0.0) faraday (>= 1, < 3) sawyer (~> 0.9) @@ -94,7 +94,7 @@ GEM unicode-display_width (3.2.0) unicode-emoji (~> 4.1) unicode-emoji (4.1.0) - uri (1.0.4) + uri (1.1.1) PLATFORMS arm64-darwin-22 diff --git a/Makefile b/Makefile index e19a164..82d7e15 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ test-ios: set -o pipefail && \ xcodebuild test \ -scheme ViewState \ - -destination "platform=iOS Simulator,name=iPhone 16,OS=18.5" \ + -destination "platform=iOS Simulator,name=iPhone 17,OS=26.1" \ clean test | xcpretty test-macos: