From cbb63a3a35ead1bc1f8e40f50527fcffd697d201 Mon Sep 17 00:00:00 2001 From: Dominik Kapusta Date: Fri, 20 Sep 2024 08:31:15 +0200 Subject: [PATCH 1/3] Add missing Asana token to environment for populating tasks since last release (#3319) Task/Issue URL: https://app.asana.com/0/1208036161861763/1208205621016469/f Description: The token is required for that step so that update_asana_for_release.sh script can actually access Asana. --- .github/workflows/publish_dmg_release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish_dmg_release.yml b/.github/workflows/publish_dmg_release.yml index a566b210f3..7d0598d2e7 100644 --- a/.github/workflows/publish_dmg_release.yml +++ b/.github/workflows/publish_dmg_release.yml @@ -267,6 +267,7 @@ jobs: id: get-tasks-since-last-internal-release if: contains(github.event.inputs.release-type, '') || github.event.inputs.release-type == 'internal' env: + ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }} GH_TOKEN: ${{ github.token }} run: | tasks="$(./scripts/update_asana_for_release.sh list-tasks-in-last-internal-release)" From ff8a7e025daa8ec44746f2f9d0c126222b650c7e Mon Sep 17 00:00:00 2001 From: Dominik Kapusta Date: Fri, 20 Sep 2024 09:24:25 +0200 Subject: [PATCH 2/3] Fix regex pattern for parsing Privacy Pro release notes (#3318) Task/Issue URL: https://app.asana.com/0/1201048563534612/1208358673191631/f Description: Use H3 tag instead of H2 --- DuckDuckGo/Updates/ReleaseNotesParser.swift | 2 +- UnitTests/Updates/ReleaseNotesParserTests.swift | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DuckDuckGo/Updates/ReleaseNotesParser.swift b/DuckDuckGo/Updates/ReleaseNotesParser.swift index da2ff6f8a9..111ebf9fe0 100644 --- a/DuckDuckGo/Updates/ReleaseNotesParser.swift +++ b/DuckDuckGo/Updates/ReleaseNotesParser.swift @@ -28,7 +28,7 @@ final class ReleaseNotesParser { // Patterns for the two sections with more flexible spacing let standardPattern = "]*>What's new\\s*
    (.*?)
" - let privacyProPattern = "]*>For Privacy Pro subscribers\\s*
    (.*?)
" + let privacyProPattern = "]*>For Privacy Pro subscribers\\s*
    (.*?)
" do { let standardRegex = try NSRegularExpression(pattern: standardPattern, options: .dotMatchesLineSeparators) diff --git a/UnitTests/Updates/ReleaseNotesParserTests.swift b/UnitTests/Updates/ReleaseNotesParserTests.swift index 68da8e6b56..20d46c300d 100644 --- a/UnitTests/Updates/ReleaseNotesParserTests.swift +++ b/UnitTests/Updates/ReleaseNotesParserTests.swift @@ -49,7 +49,7 @@ class ReleaseNotesParserTests: XCTestCase { func testParseReleaseNotes_withOnlyPrivacyProNotes() { let description = """ -

For Privacy Pro subscribers

+

For Privacy Pro subscribers

  • Exclusive feature X
  • Exclusive improvement Y
  • @@ -68,7 +68,7 @@ class ReleaseNotesParserTests: XCTestCase {
  • New feature A
  • Improvement B
-

For Privacy Pro subscribers

+

For Privacy Pro subscribers

  • Exclusive feature X
  • Exclusive improvement Y
  • @@ -87,7 +87,7 @@ class ReleaseNotesParserTests: XCTestCase {
  • New feature A
  • Improvement B
-

For Privacy Pro subscribers

+

For Privacy Pro subscribers

  • Exclusive feature X
  • Exclusive improvement Y
  • From c2fe899cd6d4fa270cd715791eb999377cf09fe2 Mon Sep 17 00:00:00 2001 From: Dax the Duck Date: Fri, 20 Sep 2024 10:29:24 +0000 Subject: [PATCH 3/3] Bump version to 1.107.0 (269) --- Configuration/BuildNumber.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig index 49d55eef8d..3393f5ba3c 100644 --- a/Configuration/BuildNumber.xcconfig +++ b/Configuration/BuildNumber.xcconfig @@ -1 +1 @@ -CURRENT_PROJECT_VERSION = 268 +CURRENT_PROJECT_VERSION = 269