@duckduckgo/autoconsent 14.11.0 → 14.12.0

package/.github/workflows/ddg-release.yml

@@ -6,6 +6,9 @@ on:
             tag_name:
                 description: 'The tag of the release to propagate'
                 required: true
+            release_task_url:
+                description: 'The link to the release task in Asana'
+                required: true
             android:
                 description: 'Propagate to Android'
                 type: boolean
@@ -28,6 +31,10 @@ on:
                 type: string
                 description: 'The tag of the release to propagate'
                 required: true
+            release_task_url:
+                type: string
+                description: 'The link to the release task in Asana'
+                required: true
             android:
                 description: 'Propagate to Android'
                 type: boolean
@@ -50,39 +57,12 @@ jobs:
     # Retrieve the corresponding Release data from the GitHub API
     # ------------------------------------------------------------------------------
     get_release_info:
-        runs-on: ubuntu-latest
-        outputs:
-            release-url: ${{ steps.get-release-url.outputs.result }}
-            release-notes: ${{ steps.get-release-notes.outputs.result }}
-        steps:
-            - name: Get Release URL
-              id: get-release-url
-              uses: actions/github-script@v4
-              with:
-                  result-encoding: string
-                  script: |
-                      const { data } = await github.repos.getReleaseByTag({
-                        owner: context.repo.owner,
-                        repo: context.repo.repo,
-                        tag: process.env.TAG
-                      });
-                      return data.html_url;
-
-            - name: Get Release Notes
-              id: get-release-notes
-              uses: actions/github-script@v4
-              with:
-                  result-encoding: string
-                  script: |
-                      const { data } = await github.repos.getReleaseByTag({
-                        owner: context.repo.owner,
-                        repo: context.repo.repo,
-                        tag: process.env.TAG
-                      });
-                      return data.body;
+        uses: ./.github/workflows/get-release-info.yml
+        with:
+            tag_name: ${{ inputs.tag_name }}
 
     # ------------------------------------------------------------------------------
-    # Create initial Asana subtasks
+    # Create platform release subtasks
     # ------------------------------------------------------------------------------
     create_asana_tasks:
         needs: get_release_info
@@ -103,7 +83,7 @@ jobs:
               env:
                   ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
               run: |
-                  JSON_STRING="$(node ./autoconsent/ci/asana-create-tasks.js)"
+                  JSON_STRING="$(node ./autoconsent/ci/asana-create-platform-release-tasks.js)"
                   echo "ASANA_OUTPUT=$JSON_STRING" >> $GITHUB_OUTPUT
 
     # ------------------------------------------------------------------------------
@@ -113,11 +93,11 @@ jobs:
     update_android:
         if: ${{ inputs.android }}
         runs-on: ubuntu-latest
-        outputs:
-            pull-request-url: ${{ steps.create-pr.outputs.pull-request-url }}
         needs:
-            - create_asana_tasks
             - get_release_info
+            - create_asana_tasks
+        outputs:
+            pull-request-url: ${{ steps.create-pr.outputs.pull-request-url }}
         env:
             RELEASE_URL: ${{ needs.get_release_info.outputs.release-url }}
         steps:
@@ -178,8 +158,8 @@ jobs:
         outputs:
             pull-request-url: ${{ steps.create-pr.outputs.pull-request-url }}
         needs:
-            - create_asana_tasks
             - get_release_info
+            - create_asana_tasks
         env:
             RELEASE_URL: ${{ needs.get_release_info.outputs.release-url }}
         steps:
@@ -249,8 +229,8 @@ jobs:
         outputs:
             pull-request-url: ${{ steps.create-pr.outputs.pull-request-url }}
         needs:
-            - create_asana_tasks
             - get_release_info
+            - create_asana_tasks
         env:
             RELEASE_URL: ${{ needs.get_release_info.outputs.release-url }}
         steps:

package/.github/workflows/get-release-info.yml

@@ -0,0 +1,49 @@
+name: Get Release Info
+
+on:
+    workflow_call:
+        inputs:
+            tag_name:
+                type: string
+                description: 'The tag of the release to get info for'
+                required: true
+        outputs:
+            release-url:
+                description: 'The HTML URL of the release'
+                value: ${{ jobs.get_release_info.outputs.release-url }}
+            release-notes:
+                description: 'The release notes body'
+                value: ${{ jobs.get_release_info.outputs.release-notes }}
+
+jobs:
+    get_release_info:
+        runs-on: ubuntu-latest
+        outputs:
+            release-url: ${{ steps.get-release-url.outputs.result }}
+            release-notes: ${{ steps.get-release-notes.outputs.result }}
+        steps:
+            - name: Get Release URL
+              id: get-release-url
+              uses: actions/github-script@v4
+              with:
+                  result-encoding: string
+                  script: |
+                      const { data } = await github.repos.getReleaseByTag({
+                        owner: context.repo.owner,
+                        repo: context.repo.repo,
+                        tag: '${{ inputs.tag_name }}'
+                      });
+                      return data.html_url;
+
+            - name: Get Release Notes
+              id: get-release-notes
+              uses: actions/github-script@v4
+              with:
+                  result-encoding: string
+                  script: |
+                      const { data } = await github.repos.getReleaseByTag({
+                        owner: context.repo.owner,
+                        repo: context.repo.repo,
+                        tag: '${{ inputs.tag_name }}'
+                      });
+                      return data.body;

package/.github/workflows/privacy-config-pr.yml

@@ -6,12 +6,20 @@ on:
             tag_name:
                 description: 'The tag of the release to use'
                 required: true
+            asana_task_gid:
+                type: string
+                description: 'The GID of the Asana task to link to'
+                required: false
     workflow_call:
         inputs:
             tag_name:
                 type: string
                 description: 'The tag of the release to use'
                 required: true
+            asana_task_gid:
+                type: string
+                description: 'The GID of the Asana task to link to'
+                required: false
 
 env:
     TAG: ${{ inputs.tag_name }}
@@ -51,5 +59,5 @@ jobs:
                   commit-message: Update autoconsent to ${{ env.TAG }}
                   branch: update-autoconsent
                   title: Update autoconsent to ${{ env.TAG }}
-                  body: ''
+                  body: 'Asana Task/Github Issue: https://app.asana.com/1/137249556945/project/1201844467387842/task/${{ inputs.asana_task_gid }}'
                   token: ${{ secrets.PRIVACY_CONFIG_PAT }}

package/.github/workflows/release.yml

@@ -4,6 +4,7 @@ on:
     push:
         branches:
             - main
+    workflow_dispatch:
 
 jobs:
     release:
@@ -29,6 +30,11 @@ jobs:
               run: |
                   npm run compile-filterlist
 
+            - name: Set Git identity
+              run: |
+                  git config --global user.email "dax@duckduckgo.com"
+                  git config --global user.name "Dax the Deployer"
+
             - name: Create Release
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -40,11 +46,51 @@ jobs:
               id: remember_tag
               run: echo "tag_name=$(git describe --exact-match --tags)" >> "$GITHUB_OUTPUT"
 
+    # ------------------------------------------------------------------------------
+    # Retrieve the corresponding Release data from the GitHub API
+    # ------------------------------------------------------------------------------
+    get_release_info:
+        needs: release
+        if: ${{ needs.release.outputs.tag_name != '' }}
+        uses: ./.github/workflows/get-release-info.yml
+        with:
+            tag_name: ${{ needs.release.outputs.tag_name }}
+
+    # ------------------------------------------------------------------------------
+    # Create initial Asana subtasks
+    # ------------------------------------------------------------------------------
+    create_asana_tasks:
+        needs: get_release_info
+        runs-on: ubuntu-latest
+        outputs:
+            task-gid: ${{ steps.create-asana-tasks.outputs.TASK_GID }}
+        env:
+            RELEASE_URL: ${{ needs.get_release_info.outputs.release-url }}
+        steps:
+            # --- Setup ---
+            - uses: actions/checkout@v3
+              with:
+                  path: autoconsent/
+            - uses: ./autoconsent/.github/actions/setup-release-scripts
+            # --- Effect ---
+            - name: Create Asana Tasks
+              id: create-asana-tasks
+              env:
+                  ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
+              run: |
+                  RELEASE_TASK_GID="$(node ./autoconsent/ci/asana-create-release-task.js)"
+                  echo "TASK_GID=$RELEASE_TASK_GID" >> "$GITHUB_OUTPUT"
+
+    # ------------------------------------------------------------------------------
+    # Create PR to privacy-configuration repository
+    # ------------------------------------------------------------------------------
     rule-release:
         name: Propagate rules to privacy config
-        needs: release
-        if: ${{ !contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'skip ci') && needs.release.outputs.tag_name != '' }}
+        needs:
+            - release
+            - create_asana_tasks
         uses: ./.github/workflows/privacy-config-pr.yml
         secrets: inherit
         with:
             tag_name: ${{ needs.release.outputs.tag_name }}
+            asana_task_gid: ${{ needs.create_asana_tasks.outputs.task-gid }}

package/CHANGELOG.md

@@ -1,3 +1,32 @@
+# v14.12.0 (Wed Aug 13 2025)
+
+#### 🚀 Enhancement
+
+- [test] Add autoconsent rules for 1 sites (0 requiring review) [#873](https://github.com/duckduckgo/autoconsent/pull/873) ([@daxtheduck](https://github.com/daxtheduck))
+
+#### 🐛 Bug Fix
+
+- Release automation update [#880](https://github.com/duckduckgo/autoconsent/pull/880) ([@sammacbeth](https://github.com/sammacbeth))
+- Fix playwright tests [#877](https://github.com/duckduckgo/autoconsent/pull/877) ([@muodov](https://github.com/muodov))
+- 🤖 Add autoconsent rules for 1 sites (0 requiring review) [#874](https://github.com/duckduckgo/autoconsent/pull/874) ([@daxtheduck](https://github.com/daxtheduck))
+
+#### ⚠️ Pushed to `main`
+
+- Temp disable release tag requirement ([@sammacbeth](https://github.com/sammacbeth))
+- Set Dax's credentials for releases ([@sammacbeth](https://github.com/sammacbeth))
+
+#### 🧪 Tests
+
+- Improve playwright tests [#852](https://github.com/duckduckgo/autoconsent/pull/852) ([@muodov](https://github.com/muodov))
+
+#### Authors: 3
+
+- Dax ([@daxtheduck](https://github.com/daxtheduck))
+- Maxim Tsoy ([@muodov](https://github.com/muodov))
+- Sam Macbeth ([@sammacbeth](https://github.com/sammacbeth))
+
+---
+
 # v14.11.0 (Wed Aug 06 2025)
 
 #### 🚀 Enhancement

package/Jenkinsfile

@@ -1,15 +1,16 @@
 def runPlaywrightTests(resultDir, browser, testFiles) {
+    def junitFile = "results-${env.REGION}.xml"
     try {
         timeout(120) {
             def testFilesArg = testFiles.join(' ')
             sh """
-                rm -f results.xml
-                PLAYWRIGHT_JUNIT_OUTPUT_NAME=results.xml npx playwright test ${testFilesArg} --project ${browser} --reporter=junit || true
+                PLAYWRIGHT_JUNIT_OUTPUT_NAME=${junitFile} npx playwright test ${testFilesArg} --project ${browser} --workers 10 --reporter=junit,line || true
             """
         }
     } finally {
-        def summary = junit skipMarkingBuildUnstable: true, skipPublishingChecks: true, testResults: 'results.xml'
-        archiveArtifacts artifacts: 'test-results/screenshots/**/*.jpg', fingerprint: true, allowEmptyArchive: true
+        def summary = junit skipMarkingBuildUnstable: true, skipPublishingChecks: true, allowEmptyResults: true, testResults: junitFile
+        archiveArtifacts artifacts: "test-results/screenshots/**/*.jpg", fingerprint: true, allowEmptyArchive: true
+        archiveArtifacts artifacts: junitFile, fingerprint: true, allowEmptyArchive: true
         return summary
     }
 }
@@ -145,13 +146,13 @@ pipeline {
                     }
 
                     githubNotify(
-                            account: 'duckduckgo',
-                            repo: 'autoconsent',
-                            context: 'Tests / Changed files',
-                            sha: "${env.GIT_COMMIT}",
-                            description: description,
-                            status: status,
-                            credentialsId: 'autoconsent-rw'
+                        account: 'duckduckgo',
+                        repo: 'autoconsent',
+                        context: 'Tests / Changed files',
+                        sha: "${env.GIT_COMMIT}",
+                        description: description,
+                        status: status,
+                        credentialsId: 'autoconsent-rw'
                     )
                 }
             }

package/ci/asana-create-platform-release-tasks.js

@@ -0,0 +1,119 @@
+/* eslint-disable camelcase */
+const Asana = require('asana');
+
+const ASANA_ACCESS_TOKEN = process.env.ASANA_ACCESS_TOKEN;
+const RELEASE_TASK_URL = process.env.RELEASE_TASK_URL || '';
+const version = process.env.TAG;
+
+const templateTaskGid = '1206774921409831';
+const projectExtractorRegex = /\[\[project_gids=(.*)]]/;
+
+// Parse task GID out of URL
+const regex = /^https:\/\/app.asana.com\/(\d+)\/((\d+)\/)?(project\/)?(?<project>\d+)(\/task)?\/(?<task>\d+).*?/;
+const match = regex.exec(RELEASE_TASK_URL);
+const releaseTaskGid = match?.groups?.task;
+
+/**
+ * @typedef {{taskGid: string, taskUrl: string, displayName: string}} platformData
+ *
+ * @typedef {{
+ *   android: platformData,
+ *   windows: platformData,
+ *   apple: platformData
+ * }} AsanaOutput
+ */
+
+/** @type {AsanaOutput} */
+const platforms = {
+    android: {
+        displayName: 'Android',
+        taskGid: '',
+        taskUrl: '',
+    },
+    windows: {
+        displayName: 'Windows',
+        taskGid: '',
+        taskUrl: '',
+    },
+    apple: {
+        displayName: 'Apple',
+        taskGid: '',
+        taskUrl: '',
+    },
+};
+
+const setupAsana = () => {
+    return Asana.Client.create({
+        defaultHeaders: {
+            'Asana-Enable': 'new_project_templates,new_user_task_lists,new_goal_memberships',
+        },
+    }).useAccessToken(ASANA_ACCESS_TOKEN);
+};
+
+async function main() {
+    const asana = setupAsana();
+    const { data: templateSubTasks } = await asana.tasks.getSubtasksForTask(templateTaskGid, {
+        opt_fields: 'name,html_notes,permalink_url',
+    });
+
+    // Creating subtasks...
+    await Promise.all(
+        templateSubTasks.map((subtask) =>
+            asana.tasks.createSubtaskForTask(releaseTaskGid, {
+                name: subtask.name,
+                html_notes: subtask.html_notes,
+                opt_fields: 'name,html_notes,permalink_url',
+            }),
+        ),
+    );
+    const { data: subtasks } = await asana.tasks.getSubtasksForTask(releaseTaskGid, { opt_fields: 'gid,name,html_notes,permalink_url' });
+    console.error('subtasks:', subtasks);
+
+    // Get html_notes from the release task
+    const { html_notes: releaseTaskNotes } = await asana.tasks.getTask(releaseTaskGid, { opt_fields: 'html_notes' });
+
+    // Updating subtasks and moving to appropriate projects...
+    for (const subtask of subtasks) {
+        const { gid, name, html_notes, permalink_url } = subtask;
+
+        const platform = Object.keys(platforms).find((key) => name.includes(platforms[key].displayName));
+        if (!platform) {
+            continue;
+        }
+
+        platforms[platform].taskGid = gid;
+        platforms[platform].taskUrl = permalink_url;
+
+        const newName = name.replace('[[version]]', version);
+        const extractedProjects = html_notes.match(projectExtractorRegex)?.[1];
+
+        const subtaskNotes = html_notes.replace(projectExtractorRegex, '').replace('[[notes]]', releaseTaskNotes);
+
+        console.error(`updating task ${gid} with name ${newName} and notes ${subtaskNotes}`);
+        await asana.tasks.updateTask(gid, { name: newName, html_notes: subtaskNotes });
+
+        if (extractedProjects) {
+            console.error(`adding projects ${extractedProjects} to task ${gid}`);
+            for (const projectGidAndSection of extractedProjects.split(',')) {
+                const [projectGid, sectionGid] = projectGidAndSection.split(':');
+                await asana.tasks.addProjectForTask(gid, { project: projectGid, section: sectionGid });
+            }
+        }
+    }
+    const jsonString = JSON.stringify(platforms);
+    return { stdout: jsonString };
+}
+
+main()
+    .then((result) => {
+        // this log is for visibility in Github web interface
+        console.error('stage result:', result.stdout);
+        // The log is needed to read the value from the bash context
+        console.log(result.stdout);
+    })
+    .catch((e) => {
+        console.error('Failed to create asana tasks:');
+        // The Asana API returns errors in e.value.errors. If that's undefined log whatever else we got
+        console.error(e.value?.errors || e);
+        process.exit(1);
+    });

package/ci/{asana-create-tasks.js → asana-create-release-task.js}

@@ -15,36 +15,6 @@ const templateTaskGid = '1206774921409831';
 const autoconsentProjectGid = '1201844467387842';
 const releaseSectionGid = '1202253736774466';
 const scheduledForReleaseSectionGid = '1207140808076253';
-const projectExtractorRegex = /\[\[project_gids=(.*)]]/;
-
-/**
- * @typedef {{taskGid: string, taskUrl: string, displayName: string}} platformData
- *
- * @typedef {{
- *   android: platformData,
- *   windows: platformData,
- *   apple: platformData
- * }} AsanaOutput
- */
-
-/** @type {AsanaOutput} */
-const platforms = {
-    android: {
-        displayName: 'Android',
-        taskGid: '',
-        taskUrl: '',
-    },
-    windows: {
-        displayName: 'Windows',
-        taskGid: '',
-        taskUrl: '',
-    },
-    apple: {
-        displayName: 'Apple',
-        taskGid: '',
-        taskUrl: '',
-    },
-};
 
 let asana;
 
@@ -58,7 +28,7 @@ const setupAsana = () => {
 
 const duplicateTemplateTask = (templateTaskGid) => {
     const duplicateOption = {
-        include: ['notes', 'assignee', 'subtasks', 'projects'],
+        include: ['notes', 'assignee', 'projects'],
         name: `Autoconsent release ${version}`,
         opt_fields: 'html_notes',
     };
@@ -161,45 +131,13 @@ const asanaCreateTasks = async () => {
     const duplicateTaskResult = await waitForJobSuccess(duplicateTaskJobGid);
     console.error('duplicateTaskResult:', duplicateTaskResult);
 
-    // Getting subtasks...
-    const { data: subtasks } = await asana.tasks.getSubtasksForTask(new_task.gid, { opt_fields: 'name,html_notes,permalink_url' });
-    console.error('subtasks:', subtasks);
-
-    // Updating subtasks and moving to appropriate projects...
-    for (const subtask of subtasks) {
-        const { gid, name, html_notes, permalink_url } = subtask;
-
-        const platform = Object.keys(platforms).find((key) => name.includes(platforms[key].displayName));
-        if (!platform) throw new Error('Unexpected platform name: ' + name);
-
-        platforms[platform].taskGid = gid;
-        platforms[platform].taskUrl = permalink_url;
-
-        const newName = name.replace('[[version]]', version);
-        const extractedProjects = html_notes.match(projectExtractorRegex)?.[1];
-
-        const subtaskNotes = html_notes.replace(projectExtractorRegex, '').replace('[[notes]]', updatedNotes);
-
-        console.error(`updating task ${gid} with name ${newName} and notes ${subtaskNotes}`);
-        await asana.tasks.updateTask(gid, { name: newName, html_notes: subtaskNotes });
-
-        if (extractedProjects) {
-            console.error(`adding projects ${extractedProjects} to task ${gid}`);
-            for (const projectGidAndSection of extractedProjects.split(',')) {
-                const [projectGid, sectionGid] = projectGidAndSection.split(':');
-                await asana.tasks.addProjectForTask(gid, { project: projectGid, section: sectionGid });
-            }
-        }
-    }
-
     const finalNotes = updatedNotes.replace('<li>[[pr_url]]</li>', version).replace('<li>[[extra_content]]</li>', version);
 
     console.error('finalNotes:', finalNotes);
     updateTaskResult = await asana.tasks.updateTask(new_task.gid, { html_notes: finalNotes });
     console.error('updateTaskResult:', updateTaskResult);
 
-    const jsonString = JSON.stringify(platforms);
-    return { stdout: jsonString };
+    return { stdout: new_task.gid };
 };
 
 asanaCreateTasks()

package/dist/addon-firefox/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Autoconsent",
-  "version": "2025.8.1",
+  "version": "2025.8.6",
   "background": {
     "scripts": [
       "background.bundle.js"