From 229e66dc3d8e629b22f96dcf1bde42cad5053b54 Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Sun, 1 Mar 2026 06:41:59 -0500 Subject: [PATCH 1/6] build: ignore IDEA IDE files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 34c9211bd..9cc800ae5 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ xcuserdata rakelib/doccoverage/ coverage/ .coveralls.yml +.idea From a9027f0ef2845349ef4f09d00f2aa855e93ee7a2 Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Sun, 1 Mar 2026 06:42:06 -0500 Subject: [PATCH 2/6] build: wakeup ci/cd --- .github/workflows/Lint.yml | 37 +++++++++++-------------------- .github/workflows/Specs.yml | 43 ++++++++++++------------------------- 2 files changed, 26 insertions(+), 54 deletions(-) diff --git a/.github/workflows/Lint.yml b/.github/workflows/Lint.yml index ed6c8556e..8eadf8bac 100644 --- a/.github/workflows/Lint.yml +++ b/.github/workflows/Lint.yml @@ -1,4 +1,13 @@ name: Lint +on: + push: + branches: + - "master" + - "*-stable" + pull_request: + branches: + - master + - "*-stable" jobs: lint: @@ -6,7 +15,7 @@ jobs: fail-fast: false matrix: ruby: [2.6] - os: [ubuntu-20.04] + os: [ubuntu-24.04] name: Lint runs-on: ${{ matrix.os }} @@ -15,37 +24,15 @@ jobs: run: echo "ImageVersion=$ImageVersion" >> $GITHUB_ENV - name: Checkout git - uses: actions/checkout@v1 + uses: actions/checkout@v6 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} - - - uses: actions/cache@v2 - with: - path: vendor/bundle - key: gems@v1-${{ matrix.os }}-${{ env.ImageVersion }}-Ruby${{ matrix.ruby }}-${{ hashFiles('Gemfile.lock') }} - restore-keys: | - gems@v1-${{ matrix.os }}-${{ env.ImageVersion }}-Ruby${{ matrix.ruby }}- - - name: Run bundle install - run: | - bundle config path vendor/bundle - bundle install --jobs 4 --retry 3 --without debugging documentation + bundler-cache: true - name: Run Tests run: bundle exec rake spec:all env: COCOAPODS_CI_TASKS: LINT - - -on: - push: - branches: - - "master" - - "*-stable" - pull_request: - branches: - - master - - "*-stable" - diff --git a/.github/workflows/Specs.yml b/.github/workflows/Specs.yml index 960307c8d..e63eee924 100644 --- a/.github/workflows/Specs.yml +++ b/.github/workflows/Specs.yml @@ -1,4 +1,13 @@ name: Specs +on: + push: + branches: + - "master" + - "*-stable" + pull_request: + branches: + - master + - "*-stable" jobs: specs: @@ -6,10 +15,10 @@ jobs: fail-fast: false matrix: ruby: ['2.7', '3.0'] - os: [ubuntu-20.04] + os: [ubuntu-24.04] include: - - os: macos-12 - ruby: system + - os: macos-14 + ruby: '2.6' name: ${{ matrix.os }} / Ruby ${{ matrix.ruby }} runs-on: ${{ matrix.os }} @@ -19,42 +28,18 @@ jobs: run: echo "ImageVersion=$ImageVersion" >> $GITHUB_ENV - name: Checkout git - uses: actions/checkout@v1 + uses: actions/checkout@v6 - name: Set up Ruby uses: ruby/setup-ruby@v1 - if: ${{ matrix.ruby != 'system' }} with: ruby-version: ${{ matrix.ruby }} + bundler-cache: true - name: Update git submodules run: git submodule update --init - - uses: actions/cache@v2 - with: - path: vendor/bundle - key: gems@v1-${{ matrix.os }}-${{ env.ImageVersion }}-Ruby${{ matrix.ruby }}-${{ hashFiles('Gemfile.lock') }} - restore-keys: | - gems@v1-${{ matrix.os }}-${{ env.ImageVersion }}-Ruby${{ matrix.ruby }}- - - - name: Run bundle install - run: | - gem install bundler -v "~> 1.17" - bundle config path vendor/bundle - bundle install --jobs 4 --retry 3 --without debugging documentation - - name: Run Tests run: bundle exec rake spec:all env: COCOAPODS_CI_TASKS: SPEC - -on: - push: - branches: - - "master" - - "*-stable" - pull_request: - branches: - - master - - "*-stable" - From 649a92576eadcfd5682b1024e1ea658ea8f22951 Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Sun, 1 Mar 2026 06:42:15 -0500 Subject: [PATCH 3/6] build: let Dependabot manage CI/CD actions --- .github/dependabot.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..403b3087e --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,10 @@ +version: 2 +updates: + - package-ecosystem: "bundler" + directory: "/" + schedule: + interval: "weekly" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" From 9e8f8655178990f45a1a2c1d89532c1a5f66b026 Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Sun, 1 Mar 2026 06:45:14 -0500 Subject: [PATCH 4/6] chore: fix-up ci --- .github/workflows/Lint.yml | 9 ++------- .github/workflows/Specs.yml | 16 +++++----------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/.github/workflows/Lint.yml b/.github/workflows/Lint.yml index 8eadf8bac..605060b1f 100644 --- a/.github/workflows/Lint.yml +++ b/.github/workflows/Lint.yml @@ -20,14 +20,9 @@ jobs: name: Lint runs-on: ${{ matrix.os }} steps: - - name: Set build image var - run: echo "ImageVersion=$ImageVersion" >> $GITHUB_ENV + - uses: actions/checkout@v6 - - name: Checkout git - uses: actions/checkout@v6 - - - name: Set up Ruby - uses: ruby/setup-ruby@v1 + - uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} bundler-cache: true diff --git a/.github/workflows/Specs.yml b/.github/workflows/Specs.yml index e63eee924..9bb9182c8 100644 --- a/.github/workflows/Specs.yml +++ b/.github/workflows/Specs.yml @@ -14,31 +14,25 @@ jobs: strategy: fail-fast: false matrix: - ruby: ['2.7', '3.0'] + ruby: ['2.7', '3.0', '3.1', '3.2', '3.3', '3.4', '4.0'] os: [ubuntu-24.04] include: - os: macos-14 ruby: '2.6' + - os: macos-26 + ruby: '3.2' name: ${{ matrix.os }} / Ruby ${{ matrix.ruby }} runs-on: ${{ matrix.os }} steps: - - name: Set build image var - run: echo "ImageVersion=$ImageVersion" >> $GITHUB_ENV + - uses: actions/checkout@v6 - - name: Checkout git - uses: actions/checkout@v6 - - - name: Set up Ruby - uses: ruby/setup-ruby@v1 + - uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} bundler-cache: true - - name: Update git submodules - run: git submodule update --init - - name: Run Tests run: bundle exec rake spec:all env: From 1f6569afdba0ba1cf1647b80d88399b80a77582e Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Sun, 1 Mar 2026 06:46:27 -0500 Subject: [PATCH 5/6] build: drop ci on 3.4 and 4.0 --- .github/workflows/Specs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Specs.yml b/.github/workflows/Specs.yml index 9bb9182c8..9178ef039 100644 --- a/.github/workflows/Specs.yml +++ b/.github/workflows/Specs.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: ['2.7', '3.0', '3.1', '3.2', '3.3', '3.4', '4.0'] + ruby: ['2.7', '3.0', '3.1', '3.2', '3.3'] os: [ubuntu-24.04] include: - os: macos-14 From e1300d91de92e2286a6529be2f030c9e75f41195 Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Sun, 1 Mar 2026 06:50:39 -0500 Subject: [PATCH 6/6] chore: only gha for dependabot --- .github/dependabot.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 403b3087e..5ace4600a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,9 +1,5 @@ version: 2 updates: - - package-ecosystem: "bundler" - directory: "/" - schedule: - interval: "weekly" - package-ecosystem: "github-actions" directory: "/" schedule: