Skip to content

Commit 519a13f

Browse files
Merge branch 'release/5.253.0'
2 parents a3dabd2 + 8f5a986 commit 519a13f

File tree

278 files changed

+13970
-2469
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+13970
-2469
lines changed

.githooks/pre-commit

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1-
21
#!/bin/bash
32
echo "Running spotless check"
43
./gradlew spotlessApply
4+
5+
echo "Running PixelDefinitions lint fix (npm run lint.fix)"
6+
pushd PixelDefinitions >/dev/null
7+
npm install
8+
# Auto fix pixel-schema lint issues
9+
npm run lint.fix
10+
popd >/dev/null
11+
512
git add `git diff --name-only --cached`
6-
exit 0
13+
exit 0
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Pixel Schema Validation
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
pull_request:
8+
paths:
9+
- 'PixelDefinitions/**'
10+
11+
jobs:
12+
pixel-validation:
13+
runs-on: ubuntu-latest
14+
permissions:
15+
contents: write
16+
steps:
17+
- name: Checkout repository
18+
uses: actions/checkout@v4
19+
20+
- name: Use Node.js 20
21+
uses: actions/setup-node@v4
22+
with:
23+
node-version: 20.x
24+
25+
- uses: actions/cache@v4
26+
with:
27+
path: ~/.npm
28+
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
29+
restore-keys: |
30+
${{ runner.os }}-node-
31+
32+
- name: Checkout internal-github-asana-utils repo
33+
uses: actions/checkout@v4
34+
with:
35+
token: ${{ secrets.DAXMOBILE_ANDROID_AUTOMATION }}
36+
path: internal-github-asana-utils
37+
repository: duckduckgo/internal-github-asana-utils
38+
39+
- name: Install dependencies
40+
run: npm ci --verbose
41+
working-directory: PixelDefinitions
42+
43+
- name: Lint
44+
run: npm run lint || (npm run lint.fix; git --no-pager diff; echo 'Pixel lint check failed, review diff above or run "npm run lint.fix"'; exit 1)
45+
working-directory: PixelDefinitions
46+
47+
- name: Run pixel validation
48+
run: npm run validate-defs-without-formatting -- -g ../internal-github-asana-utils/user_map.yml
49+
working-directory: PixelDefinitions
50+

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,8 @@ report
101101
!/node_modules/@duckduckgo/content-scope-scripts/build/android/
102102
!/node_modules/@duckduckgo/content-scope-scripts/build/android/pages/
103103
/node_modules/@duckduckgo/content-scope-scripts/build/android/pages/*
104-
!/node_modules/@duckduckgo/content-scope-scripts/build/android/pages/duckplayer/
104+
!/node_modules/@duckduckgo/content-scope-scripts/build/android/pages/duckplayer/
105+
106+
# Pixel processing results
107+
PixelDefinitions/pixel_processing_results/*
108+
PixelDefinitions/node_modules/

PixelDefinitions/.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.md

PixelDefinitions/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
For information about documenting pixels and validating them, see https://github.com/duckduckgo/pixel-schema/blob/main/README.md

PixelDefinitions/asana_notify.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"assignee": "ladamski",
3+
"followers": ["nshuba"],
4+
"tagPixelOwners": false
5+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
// This file will define pixels sent by the native experiments framework
3+
"defaultSuffixes": ["form_factor"],
4+
"activeExperiments": {}
5+
}

0 commit comments

Comments
 (0)