[pull] main from github:main

.devcontainer/devcontainer.json

@@ -0,0 +1,19 @@
+{
+  "name": "Jekyll website",
+  "image": "mcr.microsoft.com/devcontainers/jekyll:latest",
+  "features": {
+    "ghcr.io/devcontainers/features/node:1": {
+      "version": "22"
+    },
+    "ghcr.io/devcontainers/features/ruby:1": {
+      "version": "3.3.5"
+    }
+  },
+  "forwardPorts": [
+    // Jekyll server
+    4000,
+    // Live reload server
+    35729
+  ],
+  "postCreateCommand": "bundle exec jekyll serve --incremental"
+}

.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 have no affiliation with the project I am suggesting (as a maintainer, creator, contractor, or employee).
+- [ ] This change is not self-promotion.
 
 ### Which change are you proposing?
 
@@ -21,7 +21,7 @@ I'm suggesting these edits to an existing topic or collection:
 
 > Please replace this line with an explanation of why you think these changes should be made.
 
-<!-- ⚠️ ... or this section ⚠️ -->
+<!-- ⚠️ this section... ⚠️ -->
 ### Curating a new topic or collection
 
 - [ ] I've formatted my changes as a new folder directory, named for the topic or collection as it appears in the URL on GitHub (e.g. `https://github.com/topics/[NAME]` or `https://github.com/collections/[NAME]`)

.github/dependabot.yml

@@ -1,12 +1,39 @@
+---
 version: 2
 updates:
-  - package-ecosystem: github-actions
+  - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: daily
-      time: "10:00"
-      timezone: Europe/Vienna
-    pull-request-branch-name:
-      separator: "-"
+      interval: "weekly"
+      timezone: "America/Los_Angeles"
+    labels:
+      - "dependabot"
+      - "dependencies"
+      - "github-actions"
+    commit-message:
+      prefix: "chore(deps)"
     open-pull-requests-limit: 99
-    rebase-strategy: disabled
+    groups:
+      dependencies:
+        applies-to: version-updates
+        update-types:
+          - "minor"
+          - "patch"
+  - package-ecosystem: "bundler"
+    directory: /
+    schedule:
+      interval: "weekly"
+      timezone: "America/Los_Angeles"
+    labels:
+      - "dependabot"
+      - "dependencies"
+      - "bundler"
+    commit-message:
+      prefix: "chore(deps)"
+    open-pull-requests-limit: 99
+    groups:
+      dependencies:
+        applies-to: version-updates
+        update-types:
+          - "minor"
+          - "patch"

.github/workflows/collections-renames.yml

@@ -3,30 +3,36 @@ name: Check and update renamed/removed collection items
 on:
   workflow_dispatch:
   schedule:
-    - cron:  "0 * * * *" # every hour
+    - cron: "0 * * * *" # every hour
+
+permissions:
+  contents: read
 
 jobs:
   update:
+    permissions:
+      pull-requests: write
+      contents: write
     runs-on: ubuntu-latest
     if: github.repository_owner == 'github'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6.0.1
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@4c24fa5ec04b2e79eb40571b1cee2a0d2b705771 # v1.278.0
         with:
           bundler-cache: true
 
-      - name: Test collection with autofix and commit changes
-        uses: technote-space/create-pr-action@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@v8
         with:
-          EXECUTE_COMMANDS: |
-            bundle exec rake collections
-          COMMIT_MESSAGE: '✨ Autofixing renamed/removed collection items ✨'
-          COMMIT_NAME: 'GitHub Actions'
-          COMMIT_EMAIL: '[email protected]'
-          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] <[email protected]>"
+          branch: "update-collections-${PR_ID}"
+          title: "✨ Autofixing renamed/removed collection items ✨"

.github/workflows/conflict.yml

@@ -2,6 +2,10 @@ name: Check for conflicts of interest
 
 on:
   pull_request:
+  merge_group:
+
+permissions:
+  contents: read
 
 jobs:
   check:
@@ -10,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 have no affiliation with the project I am suggesting (as a maintainer, creator, contractor, or employee)"
-          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 have no affiliation with the project I am suggesting (as a maintainer, creator, contractor, or employee).')
+        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 have no affiliation with the project I am suggesting (as a maintainer, creator, contractor, or employee).')
+        if: contains(github.event.pull_request.body, '- [x] This change is not self-promotion.')
         name: Succeed

.github/workflows/jekyll_build.yml

@@ -1,30 +1,56 @@
 name: Build and Publish Jekyll for GitHub Pages
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
 
+permissions:
+  contents: read
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
 jobs:
-  jekyll:
+  build:
+    permissions:
+      pages: write
+      id-token: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: 📂 checkout
+        uses: actions/[email protected]
+
+      - name: 💎 setup ruby
+        uses: ruby/setup-ruby@4c24fa5ec04b2e79eb40571b1cee2a0d2b705771 # v1.278.0
+        with:
+          bundler-cache: true
+          cache-version: 0
+
+      - name: 📄 setup pages
+        id: pages
+        uses: actions/[email protected]
+
+      - name: 🔨 install dependencies & build site
+        uses: actions/jekyll-build-pages@44a6e6beabd48582f863aeeb6cb2151cc1716697 # v1.0.13
+
+      - name: ⚡️ upload artifact
+        uses: actions/[email protected]
+
+  deploy:
+    needs: build
+    permissions:
+      pages: write
+      id-token: write
+
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
     runs-on: ubuntu-latest
     steps:
-    - name: 📂 setup
-      uses: actions/checkout@v3
-
-    - name: 💎 setup ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 3.1.2
-
-    - name: 🔨 install dependencies & build site
-      uses: limjh16/jekyll-action-ts@v2
-      with:
-        enable_cache: true
-
-    - name: 🚀 deploy
-      uses: peaceiris/actions-gh-pages@v3
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: ./_site
-        publish_branch: gh-pages
+      - name: 🚀 deploy
+        id: deployment
+        uses: actions/[email protected]

.github/workflows/lint.yml

@@ -1,26 +1,43 @@
 name: Lint
 
 on:
-  push:
-    branches:
-      - main
-  pull_request:
+  pull_request_target:
   workflow_dispatch:
+  merge_group:
+
+permissions:
+  contents: write
+  checks: write
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6.0.1
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@v1.278.0
         with:
           bundler-cache: true
 
-      - name: Run linters
-        uses: wearerequired/lint-action@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: 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

@@ -2,27 +2,27 @@ name: Mark stale PRs
 on:
   workflow_dispatch:
   schedule:
-  - cron: "0 12 * * *"
+    - cron: "0 12 * * *"
 
 permissions:
   contents: read
 
 jobs:
   stale:
     permissions:
-      issues: write  # for actions/stale to close stale issues
-      pull-requests: write  # for actions/stale to close stale PRs
+      issues: write # for actions/stale to close stale issues
+      pull-requests: write # for actions/stale to close stale PRs
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/stale@v6
-      with:
-        stale-pr-message: >
-          This pull request has been automatically marked as stale because it has not
-          had recent activity. It will be closed if no further activity occurs.
-          Thank you for your contributions.
-        stale-pr-label: "stale"
-        exempt-pr-labels: "pinned,security,dependencies"
-        days-before-pr-stale: 30
-        days-before-pr-close: 7
-        ascending: true
-        operations-per-run: 100
+      - uses: actions/stale@v10.1.1
+        with:
+          stale-pr-message: >
+            This pull request has been automatically marked as stale because it has not
+            had recent activity. It will be closed if no further activity occurs.
+            Thank you for your contributions.
+          stale-pr-label: "stale"
+          exempt-pr-labels: "pinned,security,dependencies"
+          days-before-pr-stale: 30
+          days-before-pr-close: 7
+          ascending: true
+          operations-per-run: 100

.github/workflows/test.yml

@@ -6,6 +6,10 @@ on:
       - main
   pull_request:
   workflow_dispatch:
+  merge_group:
+
+permissions:
+  contents: read
 
 jobs:
   test:
@@ -15,12 +19,18 @@ jobs:
         test_type:
           - collections
           - topics
+          - all
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6.0.1
         with:
           fetch-depth: 0
 
+      - name: Get non-topic and non-collection changed files
+        id: all
+        if: matrix.test_type == 'all'
+        run: echo "changed=$(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | grep -ve '^topics\/' -ve '^collections\/' | xargs)" >> $GITHUB_OUTPUT
+
       - name: Get changed topic files
         id: topics
         if: matrix.test_type == 'topics'
@@ -32,15 +42,19 @@ jobs:
         run: echo "changed=$(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | grep ^collections\/ | xargs)" >> $GITHUB_OUTPUT
 
       - name: Setup Ruby
-        if: ${{ steps.topics.outputs.changed || steps.collections.outputs.changed }}
-        uses: ruby/setup-ruby@v1
+        if: ${{ steps.topics.outputs.changed || steps.collections.outputs.changed || steps.all.outputs.changed }}
+        uses: ruby/setup-ruby@4c24fa5ec04b2e79eb40571b1cee2a0d2b705771 # v1.278.0
         with:
           bundler-cache: true
 
       - name: Build and test with Rake
-        if: (matrix.test_type == 'topics' && steps.topics.outputs.changed) || (matrix.test_type == 'collections' && steps.collections.outputs.changed)
+        if: |
+          (matrix.test_type == 'topics' && steps.topics.outputs.changed) ||
+          (matrix.test_type == 'collections' && steps.collections.outputs.changed) ||
+          (matrix.test_type == 'all' && steps.all.outputs.changed)
         run: bundle exec rake ${{ matrix.test_type }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TOPIC_FILES: ${{ steps.topics.outputs.changed }}
           COLLECTION_FILES: ${{ steps.collections.outputs.changed }}
+          TEST_ALL_FILES: ${{ steps.all.outputs.changed }}