-
Notifications
You must be signed in to change notification settings - Fork 417
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into sam/codeql-support
* develop: (84 commits) Improve Sync-related database cleaning logic (#1933) Fix PacketTunnelProvider embedding for Alpha builds (#1932) Add alpha specific app groups (#1934) Replaces useSystemKeychain with keychain type (#1928) Add Commit hook install script (#1845) Run checks on all PRs (#1929) extend valid urls to include IPv6 (#1919) Status view error UI (#1915) NetP Design Review minus errors (#1923) Add a GHA job to build the app in release configuration (#1848) Release 7.85.0 (#1926) Update WireGuard version (#1918) BSK Hotfix 74.0.1-1 (#1924) Post merge PR check (#1920) Autofill letter icons for macOS (#1911) Alpha build readiness (#1913) bump C-S-S to 4.32.0 (#1914) Update NetP endpoint (#1905) Network Protection debug menu (#1910) Add support for syncing Credentials (#1844) ...
- Loading branch information
Showing
226 changed files
with
11,206 additions
and
12,476 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,8 +4,6 @@ on: | |
| push: | ||
| branches: [ develop, "release/**" ] | ||
| pull_request: | ||
| branches: [ develop, "release/**" ] | ||
|
|
||
|
|
||
| jobs: | ||
| swiftlint: | ||
|
|
@@ -80,13 +78,107 @@ jobs: | |
| run: | | ||
| set -o pipefail && xcodebuild test \ | ||
| -scheme "DuckDuckGo" \ | ||
| -destination "platform=iOS Simulator,name=iPhone 14" \ | ||
| -destination "platform=iOS Simulator,name=iPhone 14,OS=16.4" \ | ||
| -derivedDataPath "DerivedData" \ | ||
| DDG_SLOW_COMPILE_CHECK_THRESHOLD=250 \ | ||
| | tee xcodebuild.log \ | ||
| | xcbeautify --report junit --report-path . --junit-report-filename unittests.xml | ||
| - name: Upload logs if workflow failed | ||
| uses: actions/upload-artifact@v3 | ||
| if: failure() | ||
| with: | ||
| name: BuildLogs | ||
| path: | | ||
| xcodebuild.log | ||
| DerivedData/Logs/Test/*.xcresult | ||
| retention-days: 7 | ||
|
|
||
| - name: Publish unit tests report | ||
| uses: mikepenz/action-junit-report@v3 | ||
| with: | ||
| report_paths: unittests.xml | ||
|
|
||
| release-build: | ||
|
|
||
| name: Make Release Build | ||
|
|
||
| runs-on: macos-13 | ||
| timeout-minutes: 30 | ||
|
|
||
| steps: | ||
|
|
||
| - name: Register SSH keys for access to certificates | ||
| uses: webfactory/[email protected] | ||
| with: | ||
| ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY_FASTLANE_MATCH }} | ||
|
|
||
| - name: Check out the code | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| submodules: recursive | ||
|
|
||
| - name: Set cache key hash | ||
| run: | | ||
| has_only_tags=$(jq '[ .object.pins[].state | has("version") ] | all' DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved) | ||
| if [[ "$has_only_tags" == "true" ]]; then | ||
| echo "cache_key_hash=${{ hashFiles('DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}" >> $GITHUB_ENV | ||
| else | ||
| echo "Package.resolved contains dependencies specified by branch or commit, skipping cache." | ||
| fi | ||
| - name: Cache SPM | ||
| if: env.cache_key_hash | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: DerivedData/SourcePackages | ||
| key: ${{ runner.os }}-spm-release-${{ env.cache_key_hash }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-spm-release- | ||
| - name: Install xcbeautify | ||
| run: brew install xcbeautify | ||
|
|
||
| - name: Select Xcode | ||
| run: sudo xcode-select -s /Applications/Xcode_$(<.xcode-version).app/Contents/Developer | ||
|
|
||
| - name: Prepare fastlane | ||
| run: bundle install | ||
|
|
||
| - name: Build the app | ||
| env: | ||
| APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }} | ||
| APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }} | ||
| APPLE_API_KEY_ISSUER: ${{ secrets.APPLE_API_KEY_ISSUER }} | ||
| MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} | ||
| run: | | ||
| bundle exec fastlane sync_signing | ||
| set -o pipefail && xcodebuild \ | ||
| -scheme "DuckDuckGo" \ | ||
| -destination "platform=iOS Simulator,name=iPhone 14" \ | ||
| -derivedDataPath "DerivedData" \ | ||
| -configuration "Release" \ | ||
| | xcbeautify | ||
| asana: | ||
| name: Create Asana Task | ||
| needs: [swiftlint, unit-tests, shellcheck, release-build] | ||
|
|
||
| if: failure() && github.ref_name == 'develop' | ||
|
|
||
| env: | ||
| WORKFLOW_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} | ||
|
|
||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: Create Asana Task | ||
| uses: malmstein/github-asana-action@master | ||
| with: | ||
| asana-pat: ${{ secrets.ASANA_ACCESS_TOKEN }} | ||
| asana-project: ${{ vars.APPLE_CI_FAILING_TESTS_PROJECT_ID }} | ||
| asana-section: ${{ vars.APPLE_CI_FAILING_TESTS_IOS_POST_MERGE_SECTION_ID }} | ||
| asana-task-name: 'PR Check is failing on develop' | ||
| action: create-asana-task | ||
| asana-task-description: PR Checks conducted after merging have failed. See ${{ env.WORKFLOW_URL }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| MARKETING_VERSION = 7.79.0 | ||
| MARKETING_VERSION = 7.85.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| // | ||
| // AppDeepLinkSchemes.swift | ||
| // DuckDuckGo | ||
| // | ||
| // Copyright © 2017 DuckDuckGo. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| public enum AppDeepLinkSchemes: String, CaseIterable { | ||
|
|
||
| case newSearch = "ddgNewSearch" | ||
| case voiceSearch = "ddgVoiceSearch" | ||
| case fireButton = "ddgFireButton" | ||
| case favorites = "ddgFavorites" | ||
| case newEmail = "ddgNewEmail" | ||
|
|
||
| case quickLink = "ddgQuickLink" | ||
|
|
||
| case addFavorite = "ddgAddFavorite" | ||
|
|
||
| public var url: URL { | ||
| URL(string: rawValue + "://")! | ||
| } | ||
|
|
||
| public func appending(_ string: String) -> String { | ||
| "\(rawValue)://\(string)" | ||
| } | ||
|
|
||
| public static func fromURL(_ url: URL) -> AppDeepLinkSchemes? { | ||
| guard let scheme = url.scheme else { return nil } | ||
| return allCases.first(where: { $0.rawValue.lowercased() == scheme.lowercased() }) | ||
| } | ||
|
|
||
| public static func query(fromQuickLink url: URL) -> String { | ||
| return url.absoluteString | ||
| .replacingOccurrences(of: AppDeepLinkSchemes.quickLink.url.absoluteString, | ||
| with: "", | ||
| options: .caseInsensitive) | ||
| } | ||
|
|
||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.