@duckduckgo/autoconsent 11.1.0 → 11.3.0

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

@@ -6,6 +6,49 @@ on:
             tag_name:
                 description: 'The tag of the release to propagate'
                 required: true
+            android:
+                description: 'Propagate to Android'
+                type: boolean
+                required: true
+                default: true
+            ios:
+                description: 'Propagate to iOS'
+                type: boolean
+                required: true
+                default: true
+            macos:
+                description: 'Propagate to macOS'
+                type: boolean
+                required: true
+                default: true
+            windows:
+                description: 'Propagate to Windows'
+                type: boolean
+                required: true
+                default: true
+
+    workflow_call:
+        inputs:
+            tag_name:
+                type: string
+                description: 'The tag of the release to propagate'
+                required: true
+            android:
+                description: 'Propagate to Android'
+                type: boolean
+                default: true
+            ios:
+                description: 'Propagate to iOS'
+                type: boolean
+                default: true
+            macos:
+                description: 'Propagate to macOS'
+                type: boolean
+                default: true
+            windows:
+                description: 'Propagate to Windows'
+                type: boolean
+                default: true
 
 env:
     TAG: ${{ inputs.tag_name }}
@@ -77,6 +120,7 @@ jobs:
     # ------------------------------------------------------------------------------
 
     update_android:
+        if: ${{ inputs.android }}
         runs-on: ubuntu-latest
         outputs:
             pull-request-url: ${{ steps.create-pr.outputs.pull-request-url }}
@@ -119,7 +163,7 @@ jobs:
                   echo "$DELIMITER" >> $GITHUB_ENV
             # --- Effect ---
             - name: Create PR for Android
-              uses: peter-evans/create-pull-request@88bf0de51c7487d91e1abbb4899332e602c58bbf
+              uses: peter-evans/create-pull-request@v7
               id: create-pr
               with:
                   path: android/
@@ -128,7 +172,7 @@ jobs:
                       package-lock.json
                       autoconsent/
                   commit-message: Update autoconsent to ${{ env.TAG }}
-                  branch: update-autoconsent-${{ env.TAG }}
+                  branch: update-autoconsent
                   title: Update autoconsent to ${{ env.TAG }}
                   body: '${{ env.PR_BODY_ANDROID }}'
                   token: ${{ secrets.DAX_WEB_AUTOFILL_AUTOMATION }}
@@ -138,6 +182,7 @@ jobs:
     # ------------------------------------------------------------------------------
 
     update_ios:
+        if: ${{ inputs.ios }}
         runs-on: ubuntu-latest
         outputs:
             pull-request-url: ${{ steps.create-pr.outputs.pull-request-url }}
@@ -180,7 +225,7 @@ jobs:
                   echo "$DELIMITER" >> $GITHUB_ENV
             # --- Effect ---
             - name: Create PR for iOS
-              uses: peter-evans/create-pull-request@88bf0de51c7487d91e1abbb4899332e602c58bbf
+              uses: peter-evans/create-pull-request@v7
               id: create-pr
               with:
                   path: ios/
@@ -189,7 +234,7 @@ jobs:
                       package-lock.json
                       DuckDuckGo/Autoconsent/
                   commit-message: Update autoconsent to ${{ env.TAG }}
-                  branch: update-autoconsent-${{ env.TAG }}
+                  branch: update-autoconsent
                   title: Update autoconsent to ${{ env.TAG }}
                   body: '${{ env.PR_BODY_IOS }}'
                   token: ${{ secrets.DAX_WEB_AUTOFILL_AUTOMATION }}
@@ -199,6 +244,7 @@ jobs:
     # ------------------------------------------------------------------------------
 
     update_macos:
+        if: ${{ inputs.macos }}
         runs-on: ubuntu-latest
         outputs:
             pull-request-url: ${{ steps.create-pr.outputs.pull-request-url }}
@@ -241,7 +287,7 @@ jobs:
                   echo "$DELIMITER" >> $GITHUB_ENV
             # --- Effect ---
             - name: Create PR for macOS
-              uses: peter-evans/create-pull-request@88bf0de51c7487d91e1abbb4899332e602c58bbf
+              uses: peter-evans/create-pull-request@v7
               id: create-pr
               with:
                   path: macos/
@@ -250,7 +296,7 @@ jobs:
                       package-lock.json
                       DuckDuckGo/Autoconsent/
                   commit-message: Update autoconsent to ${{ env.TAG }}
-                  branch: update-autoconsent-${{ env.TAG }}
+                  branch: update-autoconsent
                   title: Update autoconsent to ${{ env.TAG }}
                   body: '${{ env.PR_BODY_MACOS }}'
                   token: ${{ secrets.DAX_WEB_AUTOFILL_AUTOMATION }}
@@ -260,6 +306,7 @@ jobs:
     # ------------------------------------------------------------------------------
 
     update_windows:
+        if: ${{ inputs.windows }}
         runs-on: ubuntu-latest
         outputs:
             pull-request-url: ${{ steps.create-pr.outputs.pull-request-url }}
@@ -302,14 +349,14 @@ jobs:
                   echo "$DELIMITER" >> $GITHUB_ENV
             # --- Effect ---
             - name: Create PR for Windows
-              uses: peter-evans/create-pull-request@88bf0de51c7487d91e1abbb4899332e602c58bbf
+              uses: peter-evans/create-pull-request@v7
               id: create-pr
               with:
                   path: windows/
                   add-paths: |
                       WindowsBrowser/Application/Autoconsent/
                   commit-message: Update autoconsent to ${{ env.TAG }}
-                  branch: update-autoconsent-${{ env.TAG }}
+                  branch: update-autoconsent
                   title: Update autoconsent to ${{ env.TAG }}
                   body: '${{ env.PR_BODY_WINDOWS }}'
                   token: ${{ secrets.DAX_WEB_AUTOFILL_AUTOMATION }}

package/.github/workflows/release.yml

@@ -8,7 +8,9 @@ on:
 jobs:
     release:
         runs-on: ubuntu-latest
-        if: "!contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'skip ci')"
+        if: ${{ !contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'skip ci') }}
+        outputs:
+            tag_name: ${{ steps.remember_tag.outputs.tag_name }}
         steps:
             - uses: actions/checkout@v3
 
@@ -33,3 +35,15 @@ jobs:
                   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
               run: |
                   npm run release
+
+            - name: Remember git tag
+              id: remember_tag
+              run: echo "tag_name=$(git describe --exact-match --tags)" >> "$GITHUB_OUTPUT"
+
+    ddg-release:
+        name: Propagate to DDG apps
+        needs: release
+        if: ${{ !contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'skip ci') }}
+        uses: ./.github/workflows/ddg-release.yml
+        with:
+            tag_name: ${{ needs.release.outputs.tag_name }}

package/.prettierignore

@@ -3,5 +3,6 @@ dist
 data
 package.json
 package-lock.json
+addon/manifest.*.json
 **/*.md
 **/*.har

package/CHANGELOG.md

@@ -1,3 +1,39 @@
+# v11.3.0 (Fri Nov 15 2024)
+
+#### 🚀 Enhancement
+
+- Fix release workflow parameters [#531](https://github.com/duckduckgo/autoconsent/pull/531) ([@muodov](https://github.com/muodov))
+- Fix release workflow [#530](https://github.com/duckduckgo/autoconsent/pull/530) ([@muodov](https://github.com/muodov))
+- Automate DDG releases [#528](https://github.com/duckduckgo/autoconsent/pull/528) ([@muodov](https://github.com/muodov))
+
+#### Authors: 1
+
+- Maxim Tsoy ([@muodov](https://github.com/muodov))
+
+---
+
+# v11.2.0 (Thu Nov 14 2024)
+
+#### 🚀 Enhancement
+
+- Do not bundle network allowlist rules from easylist [#527](https://github.com/duckduckgo/autoconsent/pull/527) ([@muodov](https://github.com/muodov))
+- Bump typescript-eslint from 8.13.0 to 8.14.0 in the dev-dependencies group [#525](https://github.com/duckduckgo/autoconsent/pull/525) ([@dependabot[bot]](https://github.com/dependabot[bot]))
+
+#### 🐛 Bug Fix
+
+- Bump tldts-experimental from 6.1.58 to 6.1.60 [#526](https://github.com/duckduckgo/autoconsent/pull/526) ([@dependabot[bot]](https://github.com/dependabot[bot]))
+
+#### ⚠️ Pushed to `main`
+
+- Do not run prettier on autogenerated manifest files ([@muodov](https://github.com/muodov))
+
+#### Authors: 2
+
+- [@dependabot[bot]](https://github.com/dependabot[bot])
+- Maxim Tsoy ([@muodov](https://github.com/muodov))
+
+---
+
 # v11.1.0 (Mon Nov 11 2024)
 
 #### 🚀 Enhancement

package/ci/asana-update-tasks.js

@@ -3,10 +3,10 @@ const { replaceAllInString, getLink } = require('./release-utils.js');
 
 const ASANA_ACCESS_TOKEN = process.env.ASANA_ACCESS_TOKEN;
 const prUrls = {
-    android: process.env.ANDROID_PR_URL || 'https://example.com/',
-    ios: process.env.IOS_PR_URL || 'https://example.com/',
-    macos: process.env.MACOS_PR_URL || 'https://example.com/',
-    windows: process.env.WINDOWS_PR_URL || 'https://example.com/',
+    android: process.env.ANDROID_PR_URL,
+    ios: process.env.IOS_PR_URL,
+    macos: process.env.MACOS_PR_URL,
+    windows: process.env.WINDOWS_PR_URL,
 };
 const asanaOutputRaw = process.env.ASANA_OUTPUT;
 
@@ -34,7 +34,10 @@ const asanaUpdateTasks = async () => {
     for (const [platformName, platformObj] of platformEntries) {
         // If we're missing required data, either we haven't implemented automation for that platform yet,
         // or something went wrong in a previous job
-        if (!platformObj.taskGid || !prUrls[platformName]) continue;
+        if (!platformObj.taskGid || !prUrls[platformName]) {
+            console.error(`Skipping ${platformName} task update`);
+            continue;
+        }
 
         const { html_notes: notes } = await asana.tasks.getTask(platformObj.taskGid, { opt_fields: 'html_notes' });