Skip to content

Commit

Permalink
Merge release/1.107.0 into main
Browse files Browse the repository at this point in the history
  • Loading branch information
daxmobile authored Sep 20, 2024
2 parents 83cfe9f + c2fe899 commit a952779
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions .github/workflows/publish_dmg_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
2 changes: 1 addition & 1 deletion Configuration/BuildNumber.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CURRENT_PROJECT_VERSION = 268
CURRENT_PROJECT_VERSION = 269
2 changes: 1 addition & 1 deletion DuckDuckGo/Updates/ReleaseNotesParser.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ final class ReleaseNotesParser {

// Patterns for the two sections with more flexible spacing
let standardPattern = "<h3[^>]*>What's new</h3>\\s*<ul>(.*?)</ul>"
let privacyProPattern = "<h2[^>]*>For Privacy Pro subscribers</h2>\\s*<ul>(.*?)</ul>"
let privacyProPattern = "<h3[^>]*>For Privacy Pro subscribers</h3>\\s*<ul>(.*?)</ul>"

do {
let standardRegex = try NSRegularExpression(pattern: standardPattern, options: .dotMatchesLineSeparators)
Expand Down
6 changes: 3 additions & 3 deletions UnitTests/Updates/ReleaseNotesParserTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class ReleaseNotesParserTests: XCTestCase {

func testParseReleaseNotes_withOnlyPrivacyProNotes() {
let description = """
<h2>For Privacy Pro subscribers</h2>
<h3>For Privacy Pro subscribers</h3>
<ul>
<li>Exclusive feature X</li>
<li>Exclusive improvement Y</li>
Expand All @@ -68,7 +68,7 @@ class ReleaseNotesParserTests: XCTestCase {
<li>New feature A</li>
<li>Improvement B</li>
</ul>
<h2>For Privacy Pro subscribers</h2>
<h3>For Privacy Pro subscribers</h3>
<ul>
<li>Exclusive feature X</li>
<li>Exclusive improvement Y</li>
Expand All @@ -87,7 +87,7 @@ class ReleaseNotesParserTests: XCTestCase {
<li>New feature A</li>
<li>Improvement B
</ul>
<h2>For Privacy Pro subscribers</h2>
<h3>For Privacy Pro subscribers</h3>
<ul>
<li>Exclusive feature X</li>
<li>Exclusive improvement Y</li>
Expand Down

0 comments on commit a952779

Please sign in to comment.