MOST-4-1.Patch 1

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,7 @@
 ### Please confirm this pull request meets the following requirements:
 
 - [ ] I followed the contributing guidelines: <https://github.com/github/explore/blob/main/CONTRIBUTING.md>.
-- [ ] I am not the sole author or employee of a company who created either the topic I am modifying/adding or the collection entry I am modifying/adding.
+- [ ] This change is not self-promotion.
 
 ### Which change are you proposing?
 

.github/workflows/collections-renames.yml

@@ -16,23 +16,23 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'github'
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v5.0.0
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@1287d2b408066abada82d5ad1c63652e758428d9 # v1.214.0
+        uses: ruby/setup-ruby@efbf473cab83af4468e8606cc33eca9281bb213f # v1.256.0
         with:
           bundler-cache: true
 
-      - name: Test collection with autofix and commit changes
-        uses: technote-space/create-pr-action@91114507cf92349bec0a9a501c2edf1635427bc5 # v2
+      - name: Test collections and modify with changes
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           AUTOCORRECT_RENAMED_REPOS: 1
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: bundle exec rake collections
+
+      - name: Commit changes and open PR
+        uses: peter-evans/create-pull-request@v7
         with:
-          EXECUTE_COMMANDS: |
-            bundle exec rake collections
-          COMMIT_MESSAGE: "✨ Autofixing renamed/removed collection items ✨"
-          COMMIT_NAME: "GitHub Actions"
-          COMMIT_EMAIL: "actions@github.com"
-          PR_BRANCH_NAME: "update-collections-${PR_ID}"
-          PR_TITLE: "✨ Autofixing renamed/removed collection items ✨"
+          commit-message: "✨ Autofixing renamed/removed collection items ✨"
+          committer: "github-actions[bot] <actions@github.com>"
+          branch: "update-collections-${PR_ID}"
+          title: "✨ Autofixing renamed/removed collection items ✨"

.github/workflows/conflict.yml

@@ -14,12 +14,12 @@ 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 "> I am not the sole author or employee of a company who created either the topic I am modifying/adding or the collection entry I am modifying/adding."
-          echo "This is a requirement to maintain a high level of independence in this project. Please update if you are able to verify that you meet that requirement."
+          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
-        if: contains(github.event.pull_request.body, '- [ ] I am not the sole author or employee of a company who created either the topic I am modifying/adding or the collection entry I am modifying/adding.')
+        if: contains(github.event.pull_request.body, '- [ ] This change is not self-promotion.')
         name: Fail
       - run: exit 0
-        if: contains(github.event.pull_request.body, '- [x] I am not the sole author or employee of a company who created either the topic I am modifying/adding or the collection entry I am modifying/adding.')
+        if: contains(github.event.pull_request.body, '- [x] This change is not self-promotion.')
         name: Succeed

.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@v5.0.0
 
       - name: 💎 setup ruby
-        uses: ruby/setup-ruby@1287d2b408066abada82d5ad1c63652e758428d9 # v1.214.0
+        uses: ruby/setup-ruby@efbf473cab83af4468e8606cc33eca9281bb213f # v1.256.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,35 +1,43 @@
 name: Lint
 
 on:
-  push:
-    branches:
-      - main
-  pull_request:
+  pull_request_target:
   workflow_dispatch:
   merge_group:
 
 permissions:
-  contents: read
+  contents: write
+  checks: write
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v5.0.0
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@1287d2b408066abada82d5ad1c63652e758428d9 # v1.214.0
+        uses: ruby/setup-ruby@v1.256.0
         with:
           bundler-cache: true
 
-      - name: Run linters
-        if: ${{ github.event_name != 'merge_group' }}
-        uses: wearerequired/lint-action@548d8a7c4b04d3553d32ed5b6e91eb171e10e7bb # v2
-        with:
-          auto_fix: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login == github.repository_owner }}
-          rubocop: true
-          rubocop_command_prefix: bundle exec
+      - name: Run RuboCop with auto-correct
+        run: |
+          bundle exec rubocop -A
+
+      - name: Check for changes
+        id: 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: Skip with successful status
-        if: ${{ github.event_name == 'merge_group' }}
-        run: exit 0
+      - name: Commit and push changes
+        if: env.changes == 'true'
+        run: |
+          git add .
+          git commit -m "chore: auto-corrected with RuboCop"
+          git push

.github/workflows/test.yml

@@ -22,7 +22,7 @@ jobs:
           - all
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v5.0.0
         with:
           fetch-depth: 0
 
@@ -43,7 +43,7 @@ jobs:
 
       - name: Setup Ruby
         if: ${{ steps.topics.outputs.changed || steps.collections.outputs.changed || steps.all.outputs.changed }}
-        uses: ruby/setup-ruby@1287d2b408066abada82d5ad1c63652e758428d9 # v1.214.0
+        uses: ruby/setup-ruby@efbf473cab83af4468e8606cc33eca9281bb213f # v1.256.0
         with:
           bundler-cache: true
 

.github/workflows/topic-commenter.yml

@@ -0,0 +1,78 @@
+name: Topic PR Commenter
+
+# this workflow is failing due to permissions problems
+# until we can fix it with a better bot, i'll preserve
+# the code but make it so it never matches a real path
+on:
+  pull_request:
+    paths:
+      - 'ENOSUCHPATH'
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  comment:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Comment on PR with topic info
+        uses: actions/github-script@v7
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          script: |
+            // Get the PR number from the event payload
+            const prNumber = context.payload.pull_request.number;
+
+            // List the files changed in the PR
+            const { data: files } = await github.rest.pulls.listFiles({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: prNumber,
+            });
+
+            // Extract topics from any file changed in the "topics/" folder.
+            // Assumes the file name (e.g. "python.md") indicates the topic "python"
+            const topics = [];
+            for (const file of files) {
+              if (file.filename.startsWith('topics/')) {
+                const parts = file.filename.split('/');
+                const topicName = parts[parts.length - 2];
+                topics.push(topicName);
+              }
+            }
+
+            if (topics.length === 0) {
+              console.log('No topics found in changed files.');
+              return;
+            }
+
+            // Remove duplicate topic names (in case multiple files reference the same topic)
+            const uniqueTopics = [...new Set(topics)];
+
+            // Prepare the body of the comment
+            let commentBody = '## Topic Information\n\n';
+
+            for (const topic of uniqueTopics) {
+              // Query the GitHub Search API for repositories with the topic.
+              // Note: The Search API endpoint returns a JSON with a total_count field.
+              const searchResponse = await github.request('GET /search/repositories', {
+                q: `topic:${topic}`
+              });
+              const repoCount = searchResponse.data.total_count;
+
+              // Append topic details to the comment body
+              commentBody += `### ${topic}\n`;
+              commentBody += `- [Topic Page](https://github.com/topics/${topic})\n`;
+              commentBody += `- Repositories: ${repoCount}\n\n`;
+            }
+
+            // Post the comment on the PR
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: prNumber,
+              body: commentBody
+            });

CONTRIBUTING.md

@@ -94,13 +94,11 @@ Please note that all suggestions must adhere to GitHub's [Community Guidelines](
 
 To propose a new topic or collection, please **open a pull request** with your proposed additions. The [API docs](./docs/API.md) and [style guide](./docs/styleguide.md) provide guidance on the information you need to include and how it should be formatted.
 
-This repository includes [a list of the most-used GitHub topics that don't yet have extra context](topics-todo.md). If your pull request adds one of these topics, please update topics-todo.md so that the topic is checked (marked complete).
-
 **Please fill out the pull request template completely.** If you do not fill out the template, your pull request will be closed.
 
 ## Guidelines
 
-- Avoid conflicts of interest. These should be of general community interest, not a marketing vehicle for a product or a personal project. If you are a direct employee of a company creating the project, or the creator and sole maintainer, it's unlikely to be accepted.
+- Avoid conflicts of interest. These should be of general community interest, not self promotion. If it is self promotion, it's unlikely to be accepted.
 - We love experimenting with new technologies, and we are especially fond of GitHub Copilot. But as with all new technology, many of us are still getting accustomed to using generative AI tools effectively. Here are important guidelines to follow when using generative AI to contribute to this repository (adapted from the [GitHub Community Discussions CoC](https://github.com/community/community/blob/main/CODE_OF_CONDUCT.md#reasonable-use-of-ai-generated-content)):
   - Read and revise the content before you post it. Use your own authentic voice and edit.
   - Do not post AI-generated content verbatim to pad out the size and number of your contributions. Your changes should materially improve the site, not just say the same thing in different words.

Gemfile

@@ -1,17 +1,20 @@
 source "https://rubygems.org"
 
+gem "faraday", "2.13.4"
+gem "faraday-retry", "2.3.2"
 gem "github-pages", "~> 232", group: :jekyll_plugins
-
-gem "faraday-retry", "~> 2.2.1"
+gem "json", "2.13.2"
+gem "language_server-protocol", "3.17.0.5"
+gem "nokogiri", "~> 1.18.8"
+gem "rake", "13.3.0"
+gem "rubocop", "1.80.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