Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Place open tab suggestions before history and bookmark suggestions #3728

Merged
merged 23 commits into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
104dfd4
BSK -> alex/open-tab-ranking
mallexxx Jan 14, 2025
81a7eef
Merge branch 'alex/tab-search' into alex/open-tab-ranking
mallexxx Jan 14, 2025
6aa2944
Merge branch 'alex/tab-search' into alex/open-tab-ranking
mallexxx Jan 14, 2025
0fd512d
Convert Verecor child sites to be parent sites (#3678)
brianhall Jan 14, 2025
3cedd46
Add support for conditional clicking (#3623)
brianhall Jan 14, 2025
6d43367
Merge branch 'alex/tab-search' into alex/open-tab-ranking
mallexxx Jan 15, 2025
2838619
Fix Duckplayer handler URL (#3730)
afterxleep Jan 15, 2025
7fb3c16
re-enabled new onboarding for old macOS versions (#3735)
SabrinaTardio Jan 15, 2025
ca9cfb3
Add VPN App Exclusions remote feature-flag (#3734)
diegoreymendez Jan 15, 2025
6ee747e
Handle child to parent broker migration (#3596)
quanganhdo Jan 16, 2025
7ac867d
Bump version to 1.122.0 (342)
Jan 16, 2025
5444bc5
Merge release/1.122.0 into main
daxmobile Jan 16, 2025
b47c5a2
fix circular reference in AddressBarModel (#3733)
mallexxx Jan 16, 2025
8178b69
BSK Bump - Defaults internal Privacy Pro links to /subscriptions (#3741)
aataraxiaa Jan 16, 2025
0905fdb
[Release PR] Update GitHub Actions workflow naming (#3732)
samsymons Jan 17, 2025
be426a6
Bump version to 1.122.0 (343)
Jan 17, 2025
a649e77
Merge release/1.122.0 into main
daxmobile Jan 17, 2025
f9c494c
Bump version to 1.122.0 (344)
Jan 17, 2025
9d687e4
Merge release/1.122.0 into main
daxmobile Jan 17, 2025
75efc94
add tests
mallexxx Jan 17, 2025
7a489e9
BSK -> 224.7.2
mallexxx Jan 17, 2025
f52a66a
Package.resolved
mallexxx Jan 17, 2025
f683b4d
Merge remote-tracking branch 'origin/main' into alex/open-tab-ranking
mallexxx Jan 17, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Make App Store Connect Release
name: macOS - Make App Store Connect Release

on:
on:
workflow_dispatch:
inputs:
destination:
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
DSYM_S3_PATH: s3://${{ vars.DSYM_BUCKET_NAME }}/${{ vars.DSYM_BUCKET_PREFIX }}/DuckDuckGo-AppStore-${{ env.app-version }}-dSYM.zip
DSYM_S3_PATH: s3://${{ vars.DSYM_BUCKET_NAME }}/${{ vars.MACOS_DSYM_BUCKET_PREFIX }}/DuckDuckGo-AppStore-${{ env.app-version }}-dSYM.zip
run: |
echo "dsym-s3-path=${DSYM_S3_PATH}" >> $GITHUB_OUTPUT
aws s3 cp ${{ env.dsym-path }} ${{ env.DSYM_S3_PATH }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build Hotfix Release
name: macOS - Build Hotfix Release

on:
workflow_dispatch:
Expand Down Expand Up @@ -39,7 +39,7 @@ jobs:
name: Run Tests

needs: assert_release_branch
uses: ./.github/workflows/pr.yml
uses: ./.github/workflows/macos_pr.yml
secrets:
APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }}
APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
prepare_release:
name: Prepare Release
needs: run_tests
uses: ./.github/workflows/release.yml
uses: ./.github/workflows/macos_release.yml
with:
asana-task-url: ${{ github.event.inputs.asana-task-url }}
destination: appstore
Expand All @@ -112,7 +112,7 @@ jobs:
tag_and_merge:
name: Tag and Merge Branch
needs: [ prepare_release, update_asana ]
uses: ./.github/workflows/tag_release.yml
uses: ./.github/workflows/macos_tag_release.yml
with:
asana-task-url: ${{ github.event.inputs.asana-task-url }}
branch: ${{ github.ref_name }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Make Notarized DMG Release
name: macOS - Make Notarized DMG Release

on:
on:
workflow_dispatch:
inputs:
release-type:
Expand Down Expand Up @@ -181,7 +181,7 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
DSYM_BUCKET_NAME: ${{ vars.DSYM_BUCKET_NAME }}
DSYM_BUCKET_PREFIX: ${{ vars.DSYM_BUCKET_PREFIX }}
DSYM_BUCKET_PREFIX: ${{ vars.MACOS_DSYM_BUCKET_PREFIX }}
DSYM_NAME: ${{ steps.set-outputs.outputs.dsym-name }}
DSYM_LOCAL_PATH: "${{ github.workspace }}/release/${{ steps.set-outputs.outputs.dsym-name }}"
run: |
Expand Down Expand Up @@ -383,7 +383,7 @@ jobs:
Gemfile
Gemfile.lock
fastlane

- name: Set up fastlane
run: bundle install

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Bump Internal Release
name: macOS - Bump Internal Release

on:
schedule:
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
needs: validate_input_conditions

if: needs.validate_input_conditions.outputs.skip-release != 'true'
uses: ./.github/workflows/pr.yml
uses: ./.github/workflows/macos_pr.yml
with:
branch: ${{ needs.validate_input_conditions.outputs.release-branch }}
secrets:
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
prepare_release:
name: Prepare Release
needs: [ validate_input_conditions, increment_build_number ]
uses: ./.github/workflows/release.yml
uses: ./.github/workflows/macos_release.yml
with:
asana-task-url: ${{ needs.validate_input_conditions.outputs.asana-task-url }}
branch: ${{ needs.validate_input_conditions.outputs.release-branch }}
Expand All @@ -146,7 +146,7 @@ jobs:
tag_and_merge:
name: Tag and Merge Branch
needs: [ validate_input_conditions, prepare_release ]
uses: ./.github/workflows/tag_release.yml
uses: ./.github/workflows/macos_tag_release.yml
with:
asana-task-url: ${{ needs.validate_input_conditions.outputs.asana-task-url }}
branch: ${{ needs.validate_input_conditions.outputs.release-branch }}
Expand All @@ -160,7 +160,7 @@ jobs:
publish_release:
name: Publish DMG Release
needs: [ validate_input_conditions, tag_and_merge ]
uses: ./.github/workflows/publish_dmg_release.yml
uses: ./.github/workflows/macos_publish_dmg_release.yml
with:
asana-task-url: ${{ needs.validate_input_conditions.outputs.asana-task-url }}
branch: ${{ needs.validate_input_conditions.outputs.release-branch }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Code Freeze
name: macOS - Code Freeze

on:
workflow_dispatch:
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
name: Run Tests

needs: create_release_branch
uses: ./.github/workflows/pr.yml
uses: ./.github/workflows/macos_pr.yml
with:
branch: ${{ needs.create_release_branch.outputs.release_branch_name }}
secrets:
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
prepare_release:
name: Prepare Release
needs: [ create_release_branch, increment_build_number ]
uses: ./.github/workflows/release.yml
uses: ./.github/workflows/macos_release.yml
with:
asana-task-url: ${{ needs.create_release_branch.outputs.asana_task_url }}
branch: ${{ needs.create_release_branch.outputs.release_branch_name }}
Expand All @@ -120,7 +120,7 @@ jobs:
tag_and_merge:
name: Tag and Merge Branch
needs: [ create_release_branch, prepare_release ]
uses: ./.github/workflows/tag_release.yml
uses: ./.github/workflows/macos_tag_release.yml
with:
asana-task-url: ${{ needs.create_release_branch.outputs.asana_task_url }}
base-branch: ${{ github.ref_name }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Create DMG Variant
name: macOS - Create DMG Variant

on:
workflow_dispatch:
Expand Down Expand Up @@ -40,7 +40,7 @@ on:
jobs:

create-dmg-variant:

name: Create DMG Variant

env:
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:

- name: Set up fastlane
run: bundle install

- name: Sync code signing assets
env:
APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Create DMG Variants
name: macOS - Create DMG Variants

on:
workflow_dispatch:
Expand Down Expand Up @@ -42,15 +42,15 @@ jobs:
steps:
- name: Check out repository
uses: actions/checkout@v4

- name: Fetch Build Variants
id: get-build-variants
uses: ./.github/actions/asana-get-build-variants-list
with:
access-token: ${{ secrets.ASANA_ACCESS_TOKEN }}
atb-asana-task-id: ${{ vars.DMG_VARIANTS_LIST_TASK_ID }}
origin-asana-section-id: ${{ vars.DMG_VARIANTS_ORIGIN_SECTION_ID }}

download-dmg-and-upload-artifact:

name: Download Release App and upload artifact
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
strategy:
fail-fast: false
matrix: ${{ fromJSON(needs.set-up-variants.outputs.build-variants-1) }}
uses: ./.github/workflows/create_variant.yml
uses: ./.github/workflows/macos_create_variant.yml
with:
atb-variant: ${{ matrix.variant }}
origin-variant: ${{ matrix.origin }}
Expand All @@ -99,7 +99,7 @@ jobs:
strategy:
fail-fast: false
matrix: ${{ fromJSON(needs.set-up-variants.outputs.build-variants-2) }}
uses: ./.github/workflows/create_variant.yml
uses: ./.github/workflows/macos_create_variant.yml
with:
atb-variant: ${{ matrix.variant }}
origin-variant: ${{ matrix.origin }}
Expand All @@ -111,17 +111,17 @@ jobs:
AWS_SECRET_ACCESS_KEY_RELEASE_S3: ${{ secrets.AWS_SECRET_ACCESS_KEY_RELEASE_S3 }}
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
SSH_PRIVATE_KEY_FASTLANE_MATCH: ${{ secrets.SSH_PRIVATE_KEY_FASTLANE_MATCH }}

mattermost:

name: Send Mattermost message
needs: [create-variants-1, create-variants-2]
runs-on: macos-15

env:
success: ${{ needs.create-variants-1.result == 'success' && needs.create-variants-2.result == 'success' }}
failure: ${{ needs.create-variants-1.result == 'failure' || needs.create-variants-2.result == 'failure' }}

steps:
- name: Check out the code
if: ${{ env.success || env.failure }} # Don't execute when cancelled
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Danger JS
on:
name: macOS - Danger JS
on:
pull_request:
types: [labeled, unlabeled, opened, reopened, edited, synchronize]

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Set Up Hotfix Release Branch
name: macOS - Set Up Hotfix Release Branch

on:
workflow_dispatch:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: PIR E2E Tests
name: macOS - PIR E2E Tests

on:
workflow_dispatch:
schedule:
- cron: '0 3 * * 1-5' # 3AM UTC offsetted to legacy to avoid action-junit-report@v4 bug
pull_request:

jobs:
pir-e2e-tests:
name: PIR e2e tests
Expand Down Expand Up @@ -48,11 +48,11 @@ jobs:

- name: Start PIR Fake Broker
run: |
cd pir-fake-broker
cd pir-fake-broker
cd scripts
./install-prerequisites.sh
./setup-ci.sh
cd ..
cd ..
pnpm start:all &

- name: Check out the code
Expand All @@ -65,7 +65,7 @@ jobs:
run: |
cd main
bundle install

- name: Sync code signing assets
env:
APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }}
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:

- name: Publish tests report
uses: mikepenz/action-junit-report@v4
if: always()
if: always()
with:
check_name: "Test Report ${{ matrix.runner }}"
report_paths: pir-e2e-tests.xml
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr.yml → .github/workflows/macos_pr.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: PR Checks
name: macOS - PR Checks

on:
on:
push:
branches: [ main, "release/**" ]
pull_request:
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
SSH_PRIVATE_KEY_FASTLANE_MATCH: ${{ secrets.SSH_PRIVATE_KEY_FASTLANE_MATCH }}
run: bundle exec fastlane sync_signing_ci

- name: Set cache key hash
run: |
has_only_tags=$(jq '[ .pins[].state | has("version") ] | all' DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved)
Expand Down Expand Up @@ -305,7 +305,7 @@ jobs:
name: Private API Report
needs: tests
if: ${{ success() || needs.tests.outputs.private-api-check-report }}
uses: ./.github/workflows/private_api_report.yml
uses: ./.github/workflows/macos_private_api_report.yml
with:
report: ${{ needs.tests.outputs.private-api-check-report }}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Asana PR Task URL
name: macOS - Asana PR Task URL

on:
on:
pull_request:
types: [opened, edited, closed, synchronize, review_requested, ready_for_review]

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Private API Usage Report
name: macOS - Private API Usage Report

on:
workflow_call:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Promote TestFlight to App Store
name: macOS - Promote TestFlight to App Store

on:
on:
workflow_dispatch: {}

jobs:
Expand Down Expand Up @@ -31,4 +31,3 @@ jobs:
git config --global user.name "Dax the Duck"
git config --global user.email "[email protected]"
bundle exec fastlane promote_latest_testflight_to_appstore

Loading
Loading