Skip to content

Commit

Permalink
Merge branch 'main' of github.com:HTTPArchive/almanac.httparchive.org…
Browse files Browse the repository at this point in the history
… into production
  • Loading branch information
tunetheweb committed Jul 13, 2024
2 parents 43bf680 + e0c67bd commit 7cce33e
Show file tree
Hide file tree
Showing 13 changed files with 529 additions and 105 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/code-static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
uses: actions/checkout@v4
- name: Set up Python 3.8
if: ${{ matrix.language == 'python' }}
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
python-version: '3.8'
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lintsql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected].0
uses: actions/[email protected].1
with:
python-version: '3.8'
- name: Lint SQL code
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/predeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ jobs:
- name: Setup Node.js for use with actions
uses: actions/setup-node@v4
with:
node-version: '16'
node-version: '20'
- name: Set up Python 3.8
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
python-version: '3.8'
- name: Install Asian Fonts
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/production-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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@11.4.0
uses: treosh/lighthouse-ci-action@12.1.0
id: LHCIAction
with:
# For prod, we simply check for 100% in Accessibility, Best Practices and SEO
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-template-changes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Setup Node.js for use with actions
uses: actions/setup-node@v4
with:
node-version: '16'
node-version: '20'
- name: Test Template Changes
run: ./src/tools/scripts/test_template_changes.sh
- name: 'Comment PR'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test_website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:
- name: Setup Node.js for use with actions
uses: actions/setup-node@v4
with:
node-version: '16'
node-version: '20'
- name: Set up Python 3.8
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
python-version: '3.8'
- name: Run the website
Expand All @@ -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@11.4.0
uses: treosh/lighthouse-ci-action@12.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
Expand Down
1 change: 0 additions & 1 deletion src/.gcloudignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,4 @@ static/pdfs/*
**/.DS_Store
Dockerfile
.dockerignore
deployed.zip
.coverage
1 change: 0 additions & 1 deletion src/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ templates/*/rss.xml
templates/sitemap.xml
static/html/
static/js/web-vitals.js
deployed.zip
.coverage
3 changes: 1 addition & 2 deletions src/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ An `.editorconfig` file exists for those using [EditorConfig](https://editorconf

Make sure you run the following commands from within the `src` directory by executing `cd src` first.

Make sure Python (3.8 or above), pip and NodeJS (v16 or above) are installed on your machine.
Make sure Python (3.8 or above), pip and NodeJS (v20 or above) are installed on your machine.

1. If you don't have virtualenv, install it using pip.

Expand Down Expand Up @@ -376,7 +376,6 @@ The deploy script will do the following:
- Ask you to complete any local tests and confirm good to deploy
- Ask for a version number (suggesing the last verision tagged and incrementing the patch)
- Tag the release (after asking you for the version number to use)
- Generate a `deploy.zip` file of what has been deployed
- Deploy to GCP
- Push changes to `production` branch on GitHub
- Switch you back to the `main` branch.
Expand Down
437 changes: 437 additions & 0 deletions src/content/ja/2022/mobile-web.md

Large diffs are not rendered by default.

Loading

0 comments on commit 7cce33e

Please sign in to comment.