Merge branch 'github:main' into main

Author: MIATC-AF

.github/workflows/collections-renames.yml

@@ -16,10 +16,10 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'github'
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v6.0.2
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
+        uses: ruby/setup-ruby@3ff19f5e2baf30647122352b96108b1fbe250c64 # v1.299.0
         with:
           bundler-cache: true
 
@@ -30,7 +30,8 @@ jobs:
         run: bundle exec rake collections
 
       - name: Commit changes and open PR
-        uses: peter-evans/create-pull-request@v7
+        id: cpr
+        uses: peter-evans/create-pull-request@v8
         with:
           commit-message: "✨ Autofixing renamed/removed collection items ✨"
           committer: "github-actions[bot] <actions@github.com>"

.github/workflows/conflict.yml

@@ -14,7 +14,7 @@ jobs:
       - run: |
           echo "In order to review this pull request for acceptance, we need to make sure that all of the prerequisites are satisfied."
           echo "This was not checked:"
-          echo "> This change is not self-promotion.
+          echo "> This change is not self-promotion."
           echo "This is a requirement to maintain a high level of independence in this project. Please update to confirm there is no conflict of interest."
           echo "Thank you!"
           exit 1

.github/workflows/jekyll_build.yml

@@ -21,10 +21,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 📂 checkout
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v6.0.2
 
       - name: 💎 setup ruby
-        uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
+        uses: ruby/setup-ruby@3ff19f5e2baf30647122352b96108b1fbe250c64 # v1.299.0
         with:
           bundler-cache: true
           cache-version: 0
@@ -37,7 +37,7 @@ jobs:
         uses: actions/jekyll-build-pages@44a6e6beabd48582f863aeeb6cb2151cc1716697 # v1.0.13
 
       - name: ⚡️ upload artifact
-        uses: actions/upload-pages-artifact@v3.0.1
+        uses: actions/upload-pages-artifact@v4.0.0
 
   deploy:
     needs: build

.github/workflows/lint.yml

@@ -1,28 +1,65 @@
 name: Lint
 
 on:
-  pull_request:
+  pull_request_target:
   workflow_dispatch:
   merge_group:
 
-permissions:
-  contents: write
-
 jobs:
   lint:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v6.0.2
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
+        uses: ruby/setup-ruby@v1.299.0
         with:
-          bundler-cache: true
+          bundler-cache: false
+
+      - name: Install dependencies
+        run: bundle install
+
+      - name: Run RuboCop
+        run: |
+          bundle exec rubocop
+
+  autocorrect:
+    if: github.event.pull_request.head.repo.full_name == github.repository
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v6.0.2
+        with:
+          ref: ${{ github.event.pull_request.head.ref || github.ref }}
 
-      - name: Run linters
-        uses: wearerequired/lint-action@548d8a7c4b04d3553d32ed5b6e91eb171e10e7bb # v2
-        if: ${{ github.event_name == 'pull_request' }}
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1.299.0
         with:
-          auto_fix: true
-          rubocop: true
-          rubocop_command_prefix: bundle exec
+          bundler-cache: true
+
+      - name: Run RuboCop with auto-correct
+        run: |
+          bundle exec rubocop -A
+
+      - name: Check for changes
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          if git status --porcelain | grep .; then
+            echo "changes=true" >> $GITHUB_ENV
+          else
+            echo "changes=false" >> $GITHUB_ENV
+          fi
+
+      - name: Commit and push changes
+        if: env.changes == 'true'
+        run: |
+          git add .
+          git commit -m "chore: auto-corrected with RuboCop"
+          git push

.github/workflows/stale.yml

@@ -14,7 +14,7 @@ jobs:
       pull-requests: write # for actions/stale to close stale PRs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9.1.0
+      - uses: actions/stale@v10.2.0
         with:
           stale-pr-message: >
             This pull request has been automatically marked as stale because it has not

.github/workflows/test.yml

@@ -16,13 +16,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test_type:
-          - collections
-          - topics
-          - all
+        include:
+          - test_type: topics
+          - test_type: collections
+            shard: 0
+            total_shards: 4
+          - test_type: collections
+            shard: 1
+            total_shards: 4
+          - test_type: collections
+            shard: 2
+            total_shards: 4
+          - test_type: collections
+            shard: 3
+            total_shards: 4
+          - test_type: all
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v6.0.2
         with:
           fetch-depth: 0
 
@@ -43,10 +54,21 @@ jobs:
 
       - name: Setup Ruby
         if: ${{ steps.topics.outputs.changed || steps.collections.outputs.changed || steps.all.outputs.changed }}
-        uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
+        uses: ruby/setup-ruby@3ff19f5e2baf30647122352b96108b1fbe250c64 # v1.299.0
         with:
           bundler-cache: true
 
+      - name: Restore API cache
+        if: |
+          (matrix.test_type == 'collections' && steps.collections.outputs.changed) ||
+          (matrix.test_type == 'all' && steps.all.outputs.changed)
+        uses: actions/cache@v4
+        with:
+          path: .api-cache.json
+          key: api-cache-${{ matrix.test_type }}-${{ github.run_id }}
+          restore-keys: |
+            api-cache-${{ matrix.test_type }}-
+
       - name: Build and test with Rake
         if: |
           (matrix.test_type == 'topics' && steps.topics.outputs.changed) ||
@@ -58,3 +80,6 @@ jobs:
           TOPIC_FILES: ${{ steps.topics.outputs.changed }}
           COLLECTION_FILES: ${{ steps.collections.outputs.changed }}
           TEST_ALL_FILES: ${{ steps.all.outputs.changed }}
+          SKIP_COLLECTION_API_CHECKS: ${{ matrix.test_type == 'all' && '1' || '' }}
+          COLLECTION_SHARD: ${{ matrix.shard }}
+          COLLECTION_TOTAL_SHARDS: ${{ matrix.total_shards }}

.github/workflows/topic-commenter.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Comment on PR with topic info
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.gitignore

@@ -8,3 +8,4 @@ vendor
 .bundle
 .idea
 .tool-versions
+.api-cache.json

Gemfile

@@ -1,17 +1,20 @@
 source "https://rubygems.org"
 
-gem "faraday-retry", "~> 2.3.1"
+gem "faraday", "2.14.1"
+gem "faraday-retry", "2.4.0"
 gem "github-pages", "~> 232", group: :jekyll_plugins
-gem "nokogiri", "~> 1.18.8"
+gem "json", "2.19.3"
+gem "language_server-protocol", "3.17.0.5"
+gem "nokogiri", "~> 1.19.2"
+gem "rake", "13.3.1"
+gem "rubocop", "1.86.0"
 
 group :test do
   gem "fastimage"
   gem "httparty"
   gem "minitest"
   gem "octokit"
   gem "pry", require: false
-  gem "rake"
-  gem "rubocop"
   gem "rubocop-performance"
   gem "safe_yaml"
 end