Merge branch 'main' of github.com:HTTPArchive/almanac.httparchive.org into production

Author: tunetheweb

.github/linters/.stylelintrc.json

@@ -25,14 +25,8 @@
             }
         ],
         "length-zero-no-unit": null,
-        "max-line-length": null,
+        "media-feature-range-notation": null,
         "no-descending-specificity": null,
-        "no-eol-whitespace": [
-            true,
-            {
-                "ignore": ["empty-lines"]
-            }
-        ],
         "property-no-unknown": [
             true,
             {
@@ -45,15 +39,13 @@
                 "ignoreProperties": ["appearance", "grid-row", "grid-column", "text-size-adjust", "transform", "transition"]
             }
         ],
-        "selector-list-comma-newline-after": "always",
         "selector-pseudo-element-no-unknown": [
             true,
             {
                 "ignorePseudoElements": ["footnote-call","footnote-marker"]
             }
         ],
         "shorthand-property-no-redundant-values": null,
-        "string-quotes": null,
         "value-keyword-case": [
             "lower",
             {

.github/workflows/add-to-release-notes.yml

@@ -16,6 +16,6 @@ jobs:
     if: github.repository == 'HTTPArchive/almanac.httparchive.org'
     steps:
     - name: Update release notes
-      uses: release-drafter/release-drafter@v6.0.0
+      uses: release-drafter/release-drafter@v6.1.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/code-static-analysis.yml

@@ -35,7 +35,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Set up Python 3.12
         if: ${{ matrix.language == 'python' }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.4.0
         with:
           python-version: '3.12'
       - name: Install dependencies

.github/workflows/linter.yml

@@ -2,7 +2,7 @@
 ## Linter GitHub Actions ##
 ###########################
 #
-# Documentation: https://github.com/github/super-linter/
+# Documentation: https://github.com/super-linter/super-linter/
 #
 # Exception config files are in the .github/linters directory
 #
@@ -27,11 +27,11 @@ jobs:
         # Only run the full workflow for manual runs or if upgrading the super linter
         if: |
             github.event_name != 'workflow_dispatch' &&
-            startsWith(github.event.pull_request.title,'Bump github/super-linter') != true
+            startsWith(github.event.pull_request.title,'Bump super-linter/super-linter') != true
         run: |
           echo "VALIDATE_ALL_CODEBASE=false" >> $GITHUB_ENV
       - name: Lint Code Base
-        uses: github/super-linter/slim@v4.10.1
+        uses: super-linter/super-linter/slim@v7.2.1
         env:
           DEFAULT_BRANCH: main
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lintsql.yml

@@ -19,7 +19,7 @@ jobs:
           # Full git history is needed to get a proper list of changed files within `super-linter`
           fetch-depth: 0
       - name: Set up Python 3.12
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.4.0
         with:
           python-version: '3.12'
       - name: Lint SQL code

.github/workflows/predeploy.yml

@@ -37,7 +37,7 @@ jobs:
       with:
         node-version: '20'
     - name: Set up Python 3.12
-      uses: actions/setup-python@v5.3.0
+      uses: actions/setup-python@v5.4.0
       with:
         python-version: '3.12'
     - name: Install Asian Fonts

.github/workflows/test_website.yml

@@ -30,7 +30,7 @@ jobs:
       with:
         node-version: '20'
     - name: Set up Python 3.12
-      uses: actions/setup-python@v5.3.0
+      uses: actions/setup-python@v5.4.0
       with:
         python-version: '3.12'
     - name: Run the website
@@ -40,7 +40,7 @@ jobs:
     - name: Use more complete checks for generated HTML linting
       run: cp -f .github/linters/.htmlhintrc_morechecks .github/linters/.htmlhintrc
     - name: Lint Generated HTML
-      uses: github/super-linter/slim@v4.10.1
+      uses: super-linter/super-linter/slim@v7.2.1
       env:
         DEFAULT_BRANCH: main
         FILTER_REGEX_INCLUDE: src/static/html/.*

CONTRIBUTING.md

@@ -1,8 +1,8 @@
 # Contributing
 
-## 2023
+## 2025
 
-We haven't begun organizing the 2023 edition yet, but if you'd be interested to contribute, you can sign up to be notified when the project planning kicks off by filling out [this interest form]([https://forms.gle/Bb2ZZj6Yw5RnJHbj8](https://forms.gle/zmk6wXfDrmkkKzXo8)). Check off all teams that interest you and give a detailed description of what your areas of expertise are so we can reach out to you with targeted opportunities.
+We haven't begun organizing the 2025 edition yet, but if you'd be interested to contribute, you can sign up to be notified when the project planning kicks off by filling out [this interest form](https://forms.gle/Juz3Ak7RkV6oSBKNA). Check off all teams that interest you and give a detailed description of what your areas of expertise are so we can reach out to you with targeted opportunities.
 
 If you have any questions about contributing, you can start a discussion here on GitHub or visit the [`#web-almanac`](https://join.slack.com/t/httparchive/shared_invite/zt-45sgwmnb-eDEatOhqssqNAKxxOSLAaA) channel on Slack.
 
@@ -30,6 +30,6 @@ If you're interested in contributing to the project, please follow the links abo
 
 ## Contributors page
 
-We want to give credit to everyone who made meaningful contributions to the Web Almanac by featuring them on the [Contributors](https://almanac.httparchive.org/en/2020/contributors) page of the website. This page allows readers to see all of the names and faces of the people from the web community who built the report, and filter contributors by team. This page is sorted randomly and changes about every three hours, so everyone gets time on the top row :)
+We want to give credit to everyone who made meaningful contributions to the Web Almanac by featuring them on the [Contributors](https://almanac.httparchive.org/en/2024/contributors) page of the website. This page allows readers to see all of the names and faces of the people from the web community who built the report, and filter contributors by team. This page is sorted randomly and changes about every three hours, so everyone gets time on the top row :)
 
-If you've contributed to the Web Almanac, please add your personal information to the JSON config file in [src/config](https://github.com/HTTPArchive/almanac.httparchive.org/tree/main/src/config), for example [2020.json](https://github.com/HTTPArchive/almanac.httparchive.org/blob/main/src/config/2020.json).
+If you've contributed to the Web Almanac, please add your personal information to the [JSON contributors config file](https://github.com/HTTPArchive/almanac.httparchive.org/tree/main/src/config/contributors.json).