Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
9697688
make more updates from WT-303 changes
dchukhin Oct 31, 2025
94bba55
Merge branch 'WT-334-cms-components-for-advertising-sub-navigation' i…
dchukhin Oct 31, 2025
fc1e91c
add ContentSubpage to the project
dchukhin Oct 31, 2025
a6e203f
update SectionHeaderBlock to support ContentSubpage designs
dchukhin Oct 31, 2025
abeaaac
add FigureWithStatisticBlock to ContentSubpage
dchukhin Oct 31, 2025
4b9fe3e
add StatisticCalloutBlock to ContentSubpage
dchukhin Nov 3, 2025
e1863c6
add FeatureListWithModalsBlock to ContentSubpage
dchukhin Nov 3, 2025
c05e987
allow StatisticBlocks to have a label above the value
dchukhin Nov 3, 2025
644e8af
add RowTextAndLinkBlock to ContentSubpage
dchukhin Nov 3, 2025
276798e
add contact banner and notifications to ContentSubpage
dchukhin Nov 3, 2025
dfa9c09
make HTML file more readable
dchukhin Nov 3, 2025
7cfc89d
Merge branch 'WT-334-cms-components-for-advertising-sub-navigation' i…
dchukhin Nov 3, 2025
64ab017
replace mozads with mza in template files
dchukhin Nov 3, 2025
52bf3a1
rename block field to be more descriptive of its function
dchukhin Nov 3, 2025
d2c6efd
do not require a heading text in SectionHeaderBlocks
dchukhin Nov 4, 2025
ae2b24c
require SectionHeaderBlocks to have a superheading, heading, or subhe…
dchukhin Nov 4, 2025
9e1f5bd
add FeatureListBlock to ContentSubpage, so it can be used on the 'Imp…
dchukhin Nov 4, 2025
6ad7c05
allow feature list item heading to have line breaks
dchukhin Nov 4, 2025
3327170
allow feature list item supporting text to be rich text
dchukhin Nov 4, 2025
e572cd7
use a more-fitting icon for RowTextAndLinkBlock
dchukhin Nov 4, 2025
832515f
Merge branch 'WT-334-cms-components-for-advertising-sub-navigation' i…
dchukhin Nov 4, 2025
81c9679
Merge branch 'WT-334-cms-components-for-advertising-sub-navigation' i…
dchukhin Nov 4, 2025
31a3237
Merge branch 'WT-334-cms-components-for-advertising-sub-navigation' i…
dchukhin Nov 4, 2025
31daeeb
Merge branch 'WT-334-cms-components-for-advertising-sub-navigation' i…
dchukhin Nov 5, 2025
dc4de78
Merge branch 'wt-303-ads-solutions-page' into WT-334-cms-components-f…
kkellydesign Nov 11, 2025
1231c27
Merge branch 'WT-334-cms-components-for-advertising-sub-navigation' i…
kkellydesign Nov 11, 2025
1303569
homepage CSS revisions
kkellydesign Nov 11, 2025
6ad9b87
impact and solutions page revisions
kkellydesign Nov 12, 2025
b5c6866
header class revisions
kkellydesign Nov 12, 2025
30d9059
feat: add post-deployment asset check management command and GHA (#16…
stevejalim Nov 12, 2025
27618f8
Make sure that pages for mixed-case Locales are properly rendered (#1…
dchukhin Nov 12, 2025
0d50820
prefer Wagtail Pages for each of advertising pages
dchukhin Nov 12, 2025
69d6856
Update playstore referrer utms (#16851)
janbrasna Nov 12, 2025
9c333ed
make CMS Page editing more closely match springfield
dchukhin Nov 12, 2025
91a971f
move divider and background color settings from blocks to SectionBlock
dchukhin Nov 12, 2025
70d333a
update tests based on recent page structure changes
dchukhin Nov 13, 2025
0fb9401
update navigation anchor validation logic based on recent changes to …
dchukhin Nov 13, 2025
4ff1179
Fix linux download test failures (#16858)
stevejalim Nov 14, 2025
898435b
Upgrade To Wagtail 7 (#16859)
dchukhin Nov 14, 2025
6b9f275
use env to pass input parameters (#16863)
fkiriakos07 Nov 14, 2025
e82d7a9
feat: add Slack notifications for the post-deploy assets check (#16864)
stevejalim Nov 14, 2025
192015c
Bump js-yaml from 4.1.0 to 4.1.1 (#16865)
dependabot[bot] Nov 17, 2025
c492a64
Bump the playwright group in /tests/playwright with 2 updates (#16846)
dependabot[bot] Nov 18, 2025
5add2e2
Bump the dev-dependencies group across 1 directory with 2 updates (#1…
dependabot[bot] Nov 18, 2025
cfae03b
Bump the frontend group with 6 updates (#16843)
dependabot[bot] Nov 18, 2025
52ccbb0
WT-303: New Mozilla ads pages (#16810)
lucianoratamero Nov 18, 2025
80086d8
ads work refactor for better markup/sections
kkellydesign Nov 18, 2025
19020a2
Update glob override (#16875)
maureenlholland Nov 19, 2025
0b8d616
Rename unit_tests workflow and optimize (#16874)
janbrasna Nov 19, 2025
a5b4a25
Speed up integration tests CI a little (#16873)
janbrasna Nov 19, 2025
b6d9193
Homepage updates (#16861)
wen-2018 Nov 19, 2025
6848682
address l10n feedback on recent bedrock changes (#16881)
wen-2018 Nov 20, 2025
b7bbf39
Merge branch 'main' into WT-334-cms-components-for-advertising-more-c…
kkellydesign Nov 20, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,25 @@ on:
workflow_dispatch:
inputs:
branch:
description: The branch of mozilla/bedrock we're testing against - main|stage|prod|run-integration-tests
description: The branch of mozilla/bedrock to test against - main|stage|prod|run-integration-tests
required: true
git_sha:
description: The git SHA just deployed to the service we want to test
required: true
mozorg_service_hostname:
description: The root URL of the Mozorg service to run tests against
required: true

permissions:
contents: read

jobs:
notify-of-test-run-start:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
with:
sparse-checkout: .github/actions/slack
- name: Notify via Slack that tests are starting
uses: ./.github/actions/slack
with:
Expand All @@ -36,7 +42,6 @@ jobs:
integration-tests:
if: always()
runs-on: ubuntu-latest
needs: notify-of-test-run-start
strategy:
matrix:
include:
Expand Down Expand Up @@ -70,7 +75,7 @@ jobs:
- name: Fetch codebase
if: always()
uses: actions/checkout@v5
- name: Sets specific env vars IF we're on testing against dev/main only
- name: Sets specific env vars IF testing against dev/main only
if: ${{ github.event.inputs.branch == 'main'}}
run: |
echo "BOUNCER_URL=https://bouncer-bouncer.stage.mozaws.net/" >> $GITHUB_ENV
Expand All @@ -96,7 +101,6 @@ jobs:
playwright-tests:
if: always()
runs-on: ubuntu-latest
needs: [notify-of-test-run-start]
env:
PLAYWRIGHT_BASE_URL: ${{ github.event.inputs.mozorg_service_hostname }}
CI: true
Expand All @@ -123,6 +127,8 @@ jobs:
needs: [integration-tests, playwright-tests]
steps:
- uses: actions/checkout@v5
with:
sparse-checkout: .github/actions/slack
- name: Notify via Slack of test-run success
if: ${{ needs.integration-tests.result == 'success' && needs.playwright-tests.result == 'success' }}
uses: ./.github/actions/slack
Expand Down
102 changes: 102 additions & 0 deletions .github/workflows/post_deploy_asset_check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
name: Post-deploy asset check

run-name: Asset check for ${{ inputs.branch }} @ ${{ inputs.git_sha }}
env:
SLACK_CHANNEL_ID: CBX0KH5GA # #www-notify in MoCo Slack
SLACK_BOT_TOKEN: ${{secrets.SLACK_BOT_TOKEN_FOR_MEAO_NOTIFICATIONS_APP}}
on:
workflow_dispatch:
inputs:
branch:
description: Branch of mozilla/bedrock that was deployed (eg. main|stage|prod)
required: true
git_sha:
description: Git SHA that was deployed
required: true
origin_hostname:
description: Fully qualified base URL for the origin server
required: true
cdn_hostname:
description: Fully qualified base URL for the CDN (eg. https://www.mozilla.org)
required: true

jobs:
notify-of-checks-start:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
with:
sparse-checkout: |
.github/actions/slack
- name: Notify via Slack that tests are starting
uses: ./.github/actions/slack
with:
channel_id: ${{ env.SLACK_CHANNEL_ID }}
env_name: test
label: "Static-assets check for [${{ inputs.git_sha }}]"
message: "Static-assets check started"
ref: ${{ inputs.branch }}
slack_bot_token: ${{ env.SLACK_BOT_TOKEN }}
status: info

asset-check:
runs-on: ubuntu-latest
steps:
- name: Pull release image
run: docker pull mozmeao/bedrock:${{ inputs.git_sha }}

- name: Verify deployed assets are available
env:
GIT_SHA: ${{ inputs.git_sha }}
ORIGIN_HOSTNAME: ${{ inputs.origin_hostname }}
CDN_HOSTNAME: ${{ inputs.cdn_hostname }}
run: |
docker run --rm \
mozmeao/bedrock:$GIT_SHA \
python manage.py check_static_assets \
--origin-host "$ORIGIN_HOSTNAME" \
--cdn-host "$CDN_HOSTNAME" \
--manifest-path static/staticfiles.json

notify-of-checks-completion:
if: always()
runs-on: ubuntu-latest
needs: [asset-check]
steps:
- uses: actions/checkout@v5
with:
sparse-checkout: |
.github/actions/slack
- name: Notify via Slack of test-run success
if: ${{ needs.asset-check.result == 'success' }}
uses: ./.github/actions/slack
with:
channel_id: ${{ env.SLACK_CHANNEL_ID }}
env_name: test
label: "Static-assets checks for [${{ inputs.git_sha }}]"
message: "Static-assets check completed. Status: success"
ref: ${{ inputs.branch }}
slack_bot_token: ${{ env.SLACK_BOT_TOKEN }}
status: "success"
- name: Notify via Slack of test-run failure
if: ${{ needs.asset-check.result == 'failure' }}
uses: ./.github/actions/slack
with:
channel_id: ${{ env.SLACK_CHANNEL_ID }}
env_name: test
label: "Static-assets checks for [${{ inputs.git_sha }}]"
message: "Static-assets check completed. Status: failure"
ref: ${{ inputs.branch }}
slack_bot_token: ${{ env.SLACK_BOT_TOKEN }}
status: "failure"
- name: Notify via Slack of test-run cancelled
if: ${{ needs.asset-check.result == 'cancelled' }}
uses: ./.github/actions/slack
with:
env_name: test
label: "Static-assets checks for [${{ inputs.git_sha }}]"
status: "cancelled"
channel_id: ${{ env.SLACK_CHANNEL_ID }}
slack_bot_token: ${{ env.SLACK_BOT_TOKEN }}
ref: ${{ inputs.branch }}
message: "Static-assets check completed. Status: cancelled"
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

permissions:
contents: read

jobs:
test-js:
runs-on: ubuntu-latest
steps:
- name: "Install framebuffer (xvfb) and Chromium"
run: |
sudo apt-get update
sudo apt-get install chromium-browser xvfb
- uses: actions/checkout@v5
- uses: actions/setup-node@v4
with:
node-version: 20
cache: npm
- name: "Install JS dependencies"
run: npm ci
- name: "Run JS tests"
Expand Down
Loading