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

Author: tunetheweb

.github/lighthouse/lighthouse-config-dev.json

@@ -3,6 +3,7 @@
     "assert": {
       "preset": "lighthouse:recommended",
       "assertions": {
+        "bf-cache": "off",
         "bootup-time": "off",
         "canonical": "off",
         "dom-size": "off",

.github/lighthouse/lighthouse-config-prod.json

@@ -6,6 +6,7 @@
         "categories:accessibility": ["error", {"minScore": 1}],
         "categories:best-practices": ["error", {"minScore": 0.92}],
         "categories:seo": ["error", {"minScore": 1}],
+        "bf-cache": "off",
         "bootup-time": "off",
         "dom-size": "off",
         "first-contentful-paint": "off",

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

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

.github/workflows/compress-images.yml

@@ -57,7 +57,7 @@ jobs:
           github.event_name != 'pull_request' &&
           steps.calibre.outputs.markdown != ''
         id: cpr
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
         with:
           title: Auto Compress Images
           branch-suffix: timestamp

.github/workflows/linter.yml

@@ -31,8 +31,7 @@ jobs:
         run: |
           echo "VALIDATE_ALL_CODEBASE=false" >> $GITHUB_ENV
       - name: Lint Code Base
-        uses: github/super-linter@v4.10.1
-        #uses: docker://github/super-linter:v4.7.1
+        uses: github/super-linter/slim@v4.10.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.8
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v4.6.0
         with:
           python-version: '3.8'
       - name: Lint SQL code

.github/workflows/predeploy.yml

@@ -5,6 +5,7 @@
 # A pre-deploy script that must be run in GitHub Actions to:
 # - Update timestamps and hashes
 # - Generate the ebooks
+# - Upload ebooks as artifacts
 # - Submit a Pull Request with the changes
 #
 # This should be run before every release
@@ -36,7 +37,7 @@ jobs:
       with:
         node-version: '16'
     - name: Set up Python 3.8
-      uses: actions/setup-python@v4.5.0
+      uses: actions/setup-python@v4.6.0
       with:
         python-version: '3.8'
     - name: Install Asian Fonts
@@ -63,19 +64,27 @@ jobs:
       run: |
         cd src
         npm run ebooks
+    - name: Upload PDF artifact
+      if: ${{ github.event.inputs.ebooks == 'true' }}
+      uses: actions/upload-artifact@v3
+      with:
+        name: pdfs
+        path: ./src/static/pdfs/*.pdf
+        if-no-files-found: warn # 'warn' or 'ignore' are also available, defaults to `warn`
+        retention-days: 5 # defaults to 90
     - name: Update timestamps
       run: |
         cd src
         npm run timestamps
     - name: Create Pull Request
       id: cpr
-      uses: peter-evans/create-pull-request@v4
+      uses: peter-evans/create-pull-request@v5
       with:
         title: Pre-deploy Updates
         branch-suffix: timestamp
-        commit-message: Update Timestamps and Generate Ebooks
+        commit-message: Update Timestamps
         body: |
-          Updated Timestamps and Regenerated Ebooks through GitHub action
+          Updated Timestamps through GitHub action
           - Auto-generated by [create-pull-request][1] GitHub Action
 
           [1]: https://github.com/peter-evans/create-pull-request

.github/workflows/production-checks.yml

@@ -28,7 +28,7 @@ jobs:
     - name: Set the list of URLs for Lighthouse to check
       run: ./src/tools/scripts/set_lighthouse_urls.sh -p
     - name: Audit URLs using Lighthouse
-      uses: treosh/lighthouse-ci-action@9.6.8
+      uses: treosh/lighthouse-ci-action@10.1.0
       id: LHCIAction
       with:
         # For prod, we simply check for 100% in Accessibility, Best Practices and SEO

.github/workflows/test_website.yml

@@ -30,7 +30,7 @@ jobs:
       with:
         node-version: '16'
     - name: Set up Python 3.8
-      uses: actions/setup-python@v4.5.0
+      uses: actions/setup-python@v4.6.0
       with:
         python-version: '3.8'
     - 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@v4.10.1
+      uses: github/super-linter/slim@v4.10.1
       env:
         DEFAULT_BRANCH: main
         FILTER_REGEX_INCLUDE: src/static/html/.*
@@ -53,7 +53,7 @@ jobs:
         COMMIT_SHA: ${{ github.sha }}
       run: ./src/tools/scripts/set_lighthouse_urls.sh
     - name: Audit URLs using Lighthouse
-      uses: treosh/lighthouse-ci-action@9.6.8
+      uses: treosh/lighthouse-ci-action@10.1.0
       id: LHCIAction
       with:
         # For dev, turn off all timing perf audits (too unreliable) and a few others that don't work on dev

.gitignore

@@ -4,3 +4,5 @@ env/
 *.log
 *.pyc
 **/.DS_Store
+src/static/pdfs/
+.env