@duckduckgo/autoconsent 10.5.0 → 10.6.1

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

@@ -1,24 +1,62 @@
 name: Propagate Autoconsent To DDG Apps
 
 on:
-  release:
-    types: [ published ]
+  workflow_dispatch:
+    inputs:
+      tag_name:
+        description: 'The tag of the release to propagate'
+        required: true
 
 env:
-  VERSION: ${{ github.event.release.tag_name }}
-  RELEASE_URL: ${{ github.event.release.html_url }}
-  RELEASE_NOTES: ${{ github.event.release.body }}
-  PR_TITLE: Update autoconsent to ${{ github.event.release.tag_name }}
+  TAG: ${{ inputs.tag_name }}
 
 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;
 
 # ------------------------------------------------------------------------------
 # Create initial Asana subtasks
 # ------------------------------------------------------------------------------
   create_asana_tasks:
+    needs: get_release_info
     runs-on: ubuntu-latest
     outputs:
       asana-output: ${{ steps.create-asana-tasks.outputs.ASANA_OUTPUT }}
+    env:
+      RELEASE_URL: ${{ needs.get_release_info.outputs.release-url }}
+      RELEASE_NOTES: ${{ needs.get_release_info.outputs.release-notes }}
     steps:
       # --- Setup ---
       - uses: actions/checkout@v3
@@ -42,7 +80,12 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       pull-request-url: ${{ steps.create-pr.outputs.pull-request-url }}
-    needs: create_asana_tasks
+    needs:
+      - create_asana_tasks
+      - get_release_info
+    env:
+      RELEASE_URL: ${{ needs.get_release_info.outputs.release-url }}
+      RELEASE_NOTES: ${{ needs.get_release_info.outputs.release-notes }}
     steps:
       # --- Setup ---
       - uses: actions/checkout@v3
@@ -62,7 +105,7 @@ jobs:
       - name: Update Android autoconsent reference
         run: |
           cd android
-          npm install @duckduckgo/autoconsent@${{ env.VERSION }}
+          npm install @duckduckgo/autoconsent@${{ env.TAG }}
           npm run rebuild-autoconsent
           cd ..
       - name: Create Android PR Body
@@ -85,9 +128,9 @@ jobs:
             package.json
             package-lock.json
             autoconsent/
-          commit-message: Update autoconsent to ${{ env.VERSION }}
-          branch: update-autoconsent-${{ env.VERSION }}
-          title: ${{ env.PR_TITLE }}
+          commit-message: Update autoconsent to ${{ env.TAG }}
+          branch: update-autoconsent-${{ env.TAG }}
+          title: Update autoconsent to ${{ env.TAG }}
           body: "${{ env.PR_BODY_ANDROID }}"
           token: ${{ secrets.DAX_WEB_AUTOFILL_AUTOMATION }}
 
@@ -100,7 +143,12 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       pull-request-url: ${{ steps.create-pr.outputs.pull-request-url }}
-    needs: create_asana_tasks
+    needs:
+      - create_asana_tasks
+      - get_release_info
+    env:
+      RELEASE_URL: ${{ needs.get_release_info.outputs.release-url }}
+      RELEASE_NOTES: ${{ needs.get_release_info.outputs.release-notes }}
     steps:
       # --- Setup ---
       - uses: actions/checkout@v3
@@ -120,7 +168,7 @@ jobs:
       - name: Update iOS autoconsent reference
         run: |
           cd ios
-          npm install @duckduckgo/autoconsent@${{ env.VERSION }}
+          npm install @duckduckgo/autoconsent@${{ env.TAG }}
           npm run rebuild-autoconsent
           cd ..
       - name: Create iOS PR Body
@@ -143,9 +191,9 @@ jobs:
             package.json
             package-lock.json
             DuckDuckGo/Autoconsent/
-          commit-message: Update autoconsent to ${{ env.VERSION }}
-          branch: update-autoconsent-${{ env.VERSION }}
-          title: ${{ env.PR_TITLE }}
+          commit-message: Update autoconsent to ${{ env.TAG }}
+          branch: update-autoconsent-${{ env.TAG }}
+          title: Update autoconsent to ${{ env.TAG }}
           body: "${{ env.PR_BODY_IOS }}"
           token: ${{ secrets.DAX_WEB_AUTOFILL_AUTOMATION }}
 
@@ -157,7 +205,12 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       pull-request-url: ${{ steps.create-pr.outputs.pull-request-url }}
-    needs: create_asana_tasks
+    needs:
+      - create_asana_tasks
+      - get_release_info
+    env:
+      RELEASE_URL: ${{ needs.get_release_info.outputs.release-url }}
+      RELEASE_NOTES: ${{ needs.get_release_info.outputs.release-notes }}
     steps:
       # --- Setup ---
       - uses: actions/checkout@v3
@@ -177,7 +230,7 @@ jobs:
       - name: Update macOS autoconsent reference
         run: |
           cd macos
-          npm install @duckduckgo/autoconsent@${{ env.VERSION }}
+          npm install @duckduckgo/autoconsent@${{ env.TAG }}
           npm run rebuild-autoconsent
           cd ..
       - name: Create macOS PR Body
@@ -200,9 +253,9 @@ jobs:
             package.json
             package-lock.json
             DuckDuckGo/Autoconsent/
-          commit-message: Update autoconsent to ${{ env.VERSION }}
-          branch: update-autoconsent-${{ env.VERSION }}
-          title: ${{ env.PR_TITLE }}
+          commit-message: Update autoconsent to ${{ env.TAG }}
+          branch: update-autoconsent-${{ env.TAG }}
+          title: Update autoconsent to ${{ env.TAG }}
           body: "${{ env.PR_BODY_MACOS }}"
           token: ${{ secrets.DAX_WEB_AUTOFILL_AUTOMATION }}
 
@@ -214,7 +267,12 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       pull-request-url: ${{ steps.create-pr.outputs.pull-request-url }}
-    needs: create_asana_tasks
+    needs:
+      - create_asana_tasks
+      - get_release_info
+    env:
+      RELEASE_URL: ${{ needs.get_release_info.outputs.release-url }}
+      RELEASE_NOTES: ${{ needs.get_release_info.outputs.release-notes }}
     steps:
       # --- Setup ---
       - uses: actions/checkout@v3
@@ -234,7 +292,7 @@ jobs:
       - name: Update Windows autoconsent reference
         run: |
           cd windows/WindowsBrowser/Application/Autoconsent/External
-          npm install @duckduckgo/autoconsent@${{ env.VERSION }}
+          npm install @duckduckgo/autoconsent@${{ env.TAG }}
           npm run rebuild-autoconsent
           cd ../../../../../
       - name: Create Windows PR Body
@@ -255,9 +313,9 @@ jobs:
           path: windows/
           add-paths: |
             WindowsBrowser/Application/Autoconsent/
-          commit-message: Update autoconsent to ${{ env.VERSION }}
-          branch: update-autoconsent-${{ env.VERSION }}
-          title: ${{ env.PR_TITLE }}
+          commit-message: Update autoconsent to ${{ env.TAG }}
+          branch: update-autoconsent-${{ env.TAG }}
+          title: Update autoconsent to ${{ env.TAG }}
           body: "${{ env.PR_BODY_WINDOWS }}"
           token: ${{ secrets.DAX_WEB_AUTOFILL_AUTOMATION }}
 

package/CHANGELOG.md

@@ -1,3 +1,39 @@
+# v10.6.1 (Fri Apr 12 2024)
+
+#### 🐛 Bug Fix
+
+- Fix Klaro rule (wogibtswas.de, www.suedtirol.com) [#404](https://github.com/duckduckgo/autoconsent/pull/404) ([@sammacbeth](https://github.com/sammacbeth))
+
+#### Authors: 1
+
+- Sam Macbeth ([@sammacbeth](https://github.com/sammacbeth))
+
+---
+
+# v10.6.0 (Fri Apr 12 2024)
+
+#### 🚀 Enhancement
+
+- Fix detection in tarteaucitron [#415](https://github.com/duckduckgo/autoconsent/pull/415) ([@muodov](https://github.com/muodov))
+
+#### 🐛 Bug Fix
+
+- Monthly Coverage data update [#413](https://github.com/duckduckgo/autoconsent/pull/413) (dax@duckduckgo.com [@sammacbeth](https://github.com/sammacbeth))
+
+#### ⚠️ Pushed to `main`
+
+- Remove git commit from asana tasks ([@muodov](https://github.com/muodov))
+- Remove the default value for the release workflow ([@muodov](https://github.com/muodov))
+- Make the ddg release workflow manual ([@muodov](https://github.com/muodov))
+
+#### Authors: 3
+
+- Dax the Deployer (dax@duckduckgo.com)
+- Maxim Tsoy ([@muodov](https://github.com/muodov))
+- Sam Macbeth ([@sammacbeth](https://github.com/sammacbeth))
+
+---
+
 # v10.5.0 (Tue Apr 02 2024)
 
 #### 🚀 Enhancement

package/ci/asana-create-tasks.js

@@ -7,8 +7,7 @@ const {getLink} = require('./release-utils.js')
 const md = new MarkdownIt()
 
 const ASANA_ACCESS_TOKEN = process.env.ASANA_ACCESS_TOKEN
-const commit = process.env.GITHUB_SHA
-const version = process.env.VERSION
+const version = process.env.TAG
 const releaseUrl = process.env.RELEASE_URL || 'https://example.com/'
 const releaseNotesRaw = process.env.RELEASE_NOTES || '<EMPTY RELEASE NOTES>'
 const releaseNotes = md.render(releaseNotesRaw)
@@ -101,7 +100,6 @@ const asanaCreateTasks = async () => {
 
   const updatedNotes =
         notes.replace('[[version]]', version)
-          .replace('[[commit]]', commit)
           .replace('[[release_url]]', getLink(releaseUrl, 'Autoconsent Release'))
           .replace('[[notes]]', releaseNotes)
           .replace(/<\/?p>/ig, '\n')

package/ci/create-pr-template.js

@@ -18,7 +18,7 @@ const platform = /** @type {ReleasePlatform} */ (process.argv[2])
 
 /** @type {CreatePRTemplateData} */
 const data = {
-  version: process.env.VERSION || '',
+  version: process.env.TAG || '',
   releaseUrl: process.env.RELEASE_URL || '',
   releaseNotesRaw: process.env.RELEASE_NOTES || '',
   asanaOutputRaw: process.env.ASANA_OUTPUT || '{}'