@duckduckgo/autoconsent 12.16.0 → 12.18.0

package/.github/workflows/pr-merged.yml

@@ -10,20 +10,22 @@ jobs:
         runs-on: ubuntu-latest
         if: github.event.pull_request.merged == true
         steps:
-            - name: Find Asana task ID
-              id: find-task
-              uses: duckduckgo/native-github-asana-sync@v1.5
+            - name: Find Asana task ID(s)
+              id: find-tasks
+              uses: duckduckgo/native-github-asana-sync@main
+              continue-on-error: true
               with:
-                  action: 'find-asana-task-id'
+                  action: 'find-asana-task-ids'
                   asana-pat: ${{ secrets.ASANA_ACCESS_TOKEN }}
                   trigger-phrase: 'Task/Issue URL:'
+                  asana-project: '1203268166580279' # CPM (Cookie Pop-up Management) Triage project
 
-            - name: Move task to "Scheduled for release" section
-              if: steps.find-task.outputs.asanaTaskId
-              uses: duckduckgo/native-github-asana-sync@v1.5
+            - name: Move task(s) to "Scheduled for release" section
+              if: steps.find-tasks.outputs.asanaTaskIds
+              uses: duckduckgo/native-github-asana-sync@main
               with:
                   action: 'add-task-asana-project'
                   asana-pat: ${{ secrets.ASANA_ACCESS_TOKEN }}
                   asana-project: '1203268166580279' # CPM (Cookie Pop-up Management) Triage project
                   asana-section: '1207140808076253' # "Scheduled for release" section ID
-                  asana-task-id: ${{ steps.find-task.outputs.asanaTaskId }}
+                  asana-task-id: ${{ steps.find-tasks.outputs.asanaTaskIds }}

package/.github/workflows/pr-opened.yml

@@ -10,28 +10,31 @@ jobs:
     process-asana-tasks:
         runs-on: ubuntu-latest
         steps:
-            - name: Add comment to Asana task
-              uses: duckduckgo/native-github-asana-sync@v1.5
+            - name: Find Asana task ID(s)
+              id: find-tasks
+              uses: duckduckgo/native-github-asana-sync@main
+              continue-on-error: true
               with:
-                  action: 'add-asana-comment'
+                  action: 'find-asana-task-ids'
                   asana-pat: ${{ secrets.ASANA_ACCESS_TOKEN }}
                   trigger-phrase: 'Task/Issue URL:'
-                  is-pinned: 'false'
+                  asana-project: '1203268166580279' # CPM (Cookie Pop-up Management) Triage project
 
-            - name: Find Asana task ID
-              id: find-task
-              uses: duckduckgo/native-github-asana-sync@v1.5
+            - name: Add comment to Asana task(s)
+              if: steps.find-tasks.outputs.asanaTaskIds
+              uses: duckduckgo/native-github-asana-sync@main
               with:
-                  action: 'find-asana-task-id'
+                  action: 'add-asana-comment'
                   asana-pat: ${{ secrets.ASANA_ACCESS_TOKEN }}
                   trigger-phrase: 'Task/Issue URL:'
+                  asana-project: '1203268166580279' # CPM (Cookie Pop-up Management) Triage project
 
-            - name: Move task to "Awaiting review" section
-              if: steps.find-task.outputs.asanaTaskId
-              uses: duckduckgo/native-github-asana-sync@v1.5
+            - name: Move task(s) to "Awaiting review" section
+              if: steps.find-tasks.outputs.asanaTaskIds
+              uses: duckduckgo/native-github-asana-sync@main
               with:
                   action: 'add-task-asana-project'
                   asana-pat: ${{ secrets.ASANA_ACCESS_TOKEN }}
                   asana-project: '1203268166580279' # CPM (Cookie Pop-up Management) Triage project
                   asana-section: '1209767000096488' # "Awaiting review" section ID
-                  asana-task-id: ${{ steps.find-task.outputs.asanaTaskId }}
+                  asana-task-id: ${{ steps.find-tasks.outputs.asanaTaskIds }}

package/CHANGELOG.md

@@ -1,3 +1,57 @@
+# v12.18.0 (Tue Apr 29 2025)
+
+#### 🚀 Enhancement
+
+- Delay reruns of the detectCmp phase until there is a dom mutation. [#721](https://github.com/duckduckgo/autoconsent/pull/721) ([@sammacbeth](https://github.com/sammacbeth))
+- Prioritize checking of site-specific rules in detection phase. [#720](https://github.com/duckduckgo/autoconsent/pull/720) ([@sammacbeth](https://github.com/sammacbeth))
+- Run detection phase sequentially per CMP. [#719](https://github.com/duckduckgo/autoconsent/pull/719) ([@sammacbeth](https://github.com/sammacbeth))
+- Fix rule for openai [#723](https://github.com/duckduckgo/autoconsent/pull/723) ([@muodov](https://github.com/muodov))
+- Update EasyList Cookie to 39338825841d682f464b10b174ea835000e30c0f [#722](https://github.com/duckduckgo/autoconsent/pull/722) ([@sammacbeth](https://github.com/sammacbeth) [@github-actions[bot]](https://github.com/github-actions[bot]))
+
+#### 🐛 Bug Fix
+
+- Only process Asana tasks when PR contains task URL [#718](https://github.com/duckduckgo/autoconsent/pull/718) ([@noisysocks](https://github.com/noisysocks))
+
+#### Authors: 4
+
+- [@github-actions[bot]](https://github.com/github-actions[bot])
+- Maxim Tsoy ([@muodov](https://github.com/muodov))
+- Robert Anderson ([@noisysocks](https://github.com/noisysocks))
+- Sam Macbeth ([@sammacbeth](https://github.com/sammacbeth))
+
+---
+
+# v12.17.0 (Mon Apr 14 2025)
+
+#### 🚀 Enhancement
+
+- Update EasyList Cookie to e1d6329233498d8cb5a5fe473e516475ee3da6e8 [#713](https://github.com/duckduckgo/autoconsent/pull/713) ([@sammacbeth](https://github.com/sammacbeth) [@github-actions[bot]](https://github.com/github-actions[bot]))
+- Bump the dev-dependencies group across 1 directory with 5 updates [#715](https://github.com/duckduckgo/autoconsent/pull/715) ([@dependabot[bot]](https://github.com/dependabot[bot]))
+- Add rule for nos.nl [#712](https://github.com/duckduckgo/autoconsent/pull/712) ([@noisysocks](https://github.com/noisysocks))
+- Update EasyList Cookie to 54998140e5d5e212ead7be504a42fe3afb8cfdc6 [#708](https://github.com/duckduckgo/autoconsent/pull/708) ([@sammacbeth](https://github.com/sammacbeth) [@github-actions[bot]](https://github.com/github-actions[bot]))
+
+#### 🐛 Bug Fix
+
+- Jenkins CI: Use GIT_COMMIT when notifying GitHub [#714](https://github.com/duckduckgo/autoconsent/pull/714) ([@noisysocks](https://github.com/noisysocks))
+- Update Asana integration to support multiple tasks and ignore tasks not in CPM project [#707](https://github.com/duckduckgo/autoconsent/pull/707) ([@noisysocks](https://github.com/noisysocks))
+- Update CI pipeline to run only relevant tests for a PR [#710](https://github.com/duckduckgo/autoconsent/pull/710) ([@noisysocks](https://github.com/noisysocks))
+- Fix HTML formatting for task list in release notes [#705](https://github.com/duckduckgo/autoconsent/pull/705) ([@noisysocks](https://github.com/noisysocks))
+
+#### ⚠️ Pushed to `main`
+
+- Try main branch of native-github-asana-sync ([@noisysocks](https://github.com/noisysocks))
+- Try a different build of native-github-asana-sync ([@noisysocks](https://github.com/noisysocks))
+- Try different build of native-github-asana-sync ([@noisysocks](https://github.com/noisysocks))
+
+#### Authors: 4
+
+- [@dependabot[bot]](https://github.com/dependabot[bot])
+- [@github-actions[bot]](https://github.com/github-actions[bot])
+- Robert Anderson ([@noisysocks](https://github.com/noisysocks))
+- Sam Macbeth ([@sammacbeth](https://github.com/sammacbeth))
+
+---
+
 # v12.16.0 (Tue Mar 25 2025)
 
 #### 🚀 Enhancement

package/Jenkinsfile

@@ -1,9 +1,10 @@
-def runPlaywrightTests(resultDir, browser, grep) {
+def runPlaywrightTests(resultDir, browser, testFiles) {
     try {
         timeout(120) {
+            def testFilesArg = testFiles.join(' ')
             sh """
                 rm -f results.xml
-                PLAYWRIGHT_JUNIT_OUTPUT_NAME=results.xml npx playwright test tests/_sample-test.spec.ts --project $browser --reporter=junit --grep "$grep"|| true
+                PLAYWRIGHT_JUNIT_OUTPUT_NAME=results.xml npx playwright test ${testFilesArg} --project ${browser} --reporter=junit || true
             """
         }
     } finally {
@@ -19,13 +20,46 @@ def withEnvFile(envfile, Closure cb) {
     }
 }
 
+def getModifiedFiles() {
+    if (env.CHANGE_ID) {
+        def changedFiles = sh(script: "git diff --name-only origin/${env.CHANGE_TARGET} HEAD", returnStdout: true).trim()
+        return changedFiles.split("\n")
+    } else {
+        return []
+    }
+}
+
+def getTestsToRun(modifiedFiles) {
+    def testsToRun = []
+
+    // Run any modified test files
+    for (file in modifiedFiles) {
+        if (file.startsWith("tests/") && file.endsWith(".spec.ts")) {
+            testsToRun.add(file)
+        }
+    }
+
+    // Run the corresponding test file for any modified rule file
+    for (file in modifiedFiles) {
+        if (file.startsWith("rules/autoconsent/") && file.endsWith(".json")) {
+            def fileName = file.substring("rules/autoconsent/".length())
+            def baseName = fileName.substring(0, fileName.lastIndexOf(".json"))
+            def testFile = "tests/${baseName}.spec.ts"
+
+            if (fileExists(testFile) && !testsToRun.contains(testFile)) {
+                testsToRun.add(testFile)
+            }
+        }
+    }
+
+    return testsToRun
+}
+
 pipeline {
     agent { label 'autoconsent-crawler' }
     parameters {
         string(name: 'TEST_RESULT_ROOT', defaultValue: '/mnt/efs/users/smacbeth/autoconsent/ci', description: 'Where test results and configuration are stored')
         choice(name: 'BROWSER', choices: ['chrome', 'webkit', 'iphoneSE', 'firefox'], description: 'Browser')
-        string(name: 'GREP', defaultValue: '', description: 'filter for tests matching a specific string')
-        string(name: 'NSITES', defaultValue: '1', description: 'number of sites to test per CMP')
         string(name: 'BRANCH', defaultValue: 'main', description: 'Branch or PR to checkout (e.g. pr/123)')
     }
     environment {
@@ -44,10 +78,10 @@ pipeline {
             steps {
                 checkout([$class: 'GitSCM', branches: [[name: "${params.BRANCH}"]],
                     extensions: [[$class: 'LocalBranch']],
-                    userRemoteConfigs: [[refspec: "+refs/pull/*/head:refs/remotes/origin/pr/*", credentialsId: 'GitHubAccess', url: 'https://github.com/duckduckgo/autoconsent.git']]])
+                    userRemoteConfigs: [[refspec: "+refs/pull/*/head:refs/remotes/origin/pr/*", credentialsId: 'autoconsent-rw', url: 'https://github.com/duckduckgo/autoconsent.git']]])
             }
         }
-        
+
         stage('Build') {
             steps {
                 sh '''
@@ -63,13 +97,22 @@ pipeline {
                 }
             }
         }
-        
+
         stage('Test') {
             steps {
-                script { 
+                script {
                     def testsFailed = 0
                     def testsTotal = 0
-                    withEnv(["NSITES=${params.NSITES}}"]) {
+
+                    def modifiedFiles = getModifiedFiles()
+                    echo "Modified files: ${modifiedFiles.join(', ')}"
+
+                    def testsToRun = getTestsToRun(modifiedFiles)
+                    echo "Tests to run: ${testsToRun.join(', ')}"
+
+                    if (testsToRun.isEmpty()) {
+                        echo "No tests to run for this change"
+                    } else {
                         def testEnvs = [
                             "${params.TEST_RESULT_ROOT}/de.env",
                             "${params.TEST_RESULT_ROOT}/us.env",
@@ -77,19 +120,32 @@ pipeline {
                         ]
                         for (testEnv in testEnvs) {
                             withEnvFile(testEnv) {
-                                def summary = runPlaywrightTests(params.TEST_RESULT_ROOT, params.BROWSER, params.GREP)
+                                def summary = runPlaywrightTests(params.TEST_RESULT_ROOT, params.BROWSER, testsToRun)
                                 testsFailed += summary.failCount
                                 testsTotal += summary.totalCount
                             }
-                        }   
+                        }
+                    }
+
+                    def status = 'SUCCESS'
+                    def description = "No tests to run"
+
+                    if (testsTotal > 0) {
+                        description = "${testsFailed}/${testsTotal} failed"
+                        if (testsFailed > 0) {
+                            status = 'FAILURE'
+                        }
                     }
+
                     githubNotify(
-                            account: 'duckduckgo', 
-                            repo: 'autoconsent', 
-                            context: 'Tests / Coverage sample',
-                            sha: "${env.GIT_COMMIT}", 
-                            description: "${testsFailed}/${testsTotal} failed", 
-                            status: testsFailed > 50 ? 'FAILURE' : 'SUCCESS')
+                            account: 'duckduckgo',
+                            repo: 'autoconsent',
+                            context: 'Tests / Changed files',
+                            sha: "${env.GIT_COMMIT}",
+                            description: description,
+                            status: status,
+                            credentialsId: 'autoconsent-rw'
+                    )
                 }
             }
         }

package/ci/asana-create-tasks.js

@@ -112,9 +112,9 @@ const processReleaseTasks = async () => {
         return '';
     }
 
-    let taskListHtml = '<strong>Tasks included in this release:</strong>\n<ul>';
+    let taskListHtml = '<strong>Tasks included in this release:</strong>\n<ul>\n';
     for (const task of tasks) {
-        taskListHtml += getLink(task.permalink_url) + '\n';
+        taskListHtml += '<li>' + getLink(task.permalink_url) + '</li>\n';
         await asana.tasks.updateTask(task.gid, { completed: true });
     }
     taskListHtml += '</ul>';