Skip to content

Commit

Permalink
Merge branch 'main' into update_firefox_versions
Browse files Browse the repository at this point in the history
  • Loading branch information
b4handjr authored Jan 8, 2025
2 parents b3775e7 + 7b39a9d commit 8d48b8f
Show file tree
Hide file tree
Showing 16 changed files with 86 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ jobs:
name: Download test files and run
command: |
curl --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/mozilla/application-services/main/install-nimbus-cli.sh | bash
pip install poetry=1.8.4
pip install poetry==1.8.4
make integration_test_nimbus_fenix PYTEST_ARGS="$PYTEST_ARGS"
- android/save-gradle-cache:
cache-prefix: v1a
Expand Down
2 changes: 1 addition & 1 deletion application-services/application-services.env
Original file line number Diff line number Diff line change
@@ -1 +1 @@
APPLICATION_SERVICES_BUILD_ID=136.20250107050243
APPLICATION_SERVICES_BUILD_ID=136.20250108050329
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
beta: a64cc659cd6532fb4e838d76c71f6162076cba17
master: 7d1b5c88343879056168aa710a9ee743392604c0
release: eac9a2a9d14dfb013cd293c69fb8c3e62f86baaa
beta: 37d3995a57630da7952db8dc641236abd87cc9aa
master: 6b61714b224f8cdca1a48ef1c51edab027f2c09f
release: bad91669ae17673b3f19d6f8d705ef156f0f7e08
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,13 @@ features:
description: Open in app button
type: Boolean
default: true
pki:
description: Certificate verification configuration
variables:
certificateTransparencyMode:
description: "What mode Certificate Transparency is in (0=disable, 1=telemetry only, 2=enforce).\n"
type: Int
default: 0
print:
description: A feature for printing from the share or browser menu.
variables:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,13 @@ features:
description: Open in app button
type: Boolean
default: true
pki:
description: Certificate verification configuration
variables:
certificateTransparencyMode:
description: "What mode Certificate Transparency is in (0=disable, 1=telemetry only, 2=enforce).\n"
type: Int
default: 0
print:
description: A feature for printing from the share or browser menu.
variables:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,14 @@ pdfjs:
open-in-app-button:
type: boolean
description: Open in app button
pki:
description: Certificate verification configuration
hasExposure: true
exposureDescription: ""
variables:
certificateTransparencyMode:
type: int
description: "What mode Certificate Transparency is in (0=disable, 1=telemetry only, 2=enforce).\n"
print:
description: A feature for printing from the share or browser menu.
hasExposure: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,13 @@ features:
description: Open in app button
type: Boolean
default: true
pki:
description: Certificate verification configuration
variables:
certificateTransparencyMode:
description: "What mode Certificate Transparency is in (0=disable, 1=telemetry only, 2=enforce).\n"
type: Int
default: 0
print:
description: A feature for printing from the share or browser menu.
variables:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,13 @@ features:
description: Open in app button
type: Boolean
default: true
pki:
description: Certificate verification configuration
variables:
certificateTransparencyMode:
description: "What mode Certificate Transparency is in (0=disable, 1=telemetry only, 2=enforce).\n"
type: Int
default: 0
print:
description: A feature for printing from the share or browser menu.
variables:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,13 @@ features:
description: Open in app button
type: Boolean
default: true
pki:
description: Certificate verification configuration
variables:
certificateTransparencyMode:
description: "What mode Certificate Transparency is in (0=disable, 1=telemetry only, 2=enforce).\n"
type: Int
default: 0
print:
description: A feature for printing from the share or browser menu.
variables:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,13 @@ features:
description: Open in app button
type: Boolean
default: true
pki:
description: Certificate verification configuration
variables:
certificateTransparencyMode:
description: "What mode Certificate Transparency is in (0=disable, 1=telemetry only, 2=enforce).\n"
type: Int
default: 0
print:
description: A feature for printing from the share or browser menu.
variables:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,14 @@ pdfjs:
open-in-app-button:
type: boolean
description: Open in app button
pki:
description: Certificate verification configuration
hasExposure: true
exposureDescription: ""
variables:
certificateTransparencyMode:
type: int
description: "What mode Certificate Transparency is in (0=disable, 1=telemetry only, 2=enforce).\n"
print:
description: A feature for printing from the share or browser menu.
hasExposure: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,13 @@ features:
description: Open in app button
type: Boolean
default: true
pki:
description: Certificate verification configuration
variables:
certificateTransparencyMode:
description: "What mode Certificate Transparency is in (0=disable, 1=telemetry only, 2=enforce).\n"
type: Int
default: 0
print:
description: A feature for printing from the share or browser menu.
variables:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,13 @@ features:
description: Open in app button
type: Boolean
default: true
pki:
description: Certificate verification configuration
variables:
certificateTransparencyMode:
description: "What mode Certificate Transparency is in (0=disable, 1=telemetry only, 2=enforce).\n"
type: Int
default: 0
print:
description: A feature for printing from the share or browser menu.
variables:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
beta: 2f218da698db4f92722be65f51a6e53d24321cec
central: 114a69547c262e92d13156de8a309ee3de9ac35a
esr115: 6a331477d572723c5a5f18cbcd665689c97165bc
esr128: 10845c3218167063ec1c2fe66ea032fb2f53162a
release: c455977f9b6c285c9c5ac1f9ae6b9bae5072ba84
beta: c04744fcc1cb75e70ce17e8d92172c3d40fbd3e6
central: bf40d95ccc9bf4bb1337d18ed853231b83382b7c
esr115: 2c64c4cc6e15d11c1dd1708dc30088074295ac62
esr128: 826f17057ab6c9f6c108d9dc489741e082c3672f
release: ad89651d634a20ea7db2bd42eedab696128c289e
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ focus/klar-v131.1: b7dca2271b14988837524a30eb154d91eb5e4912
focus/klar-v132.0: d9ed6134db59ff456d343e2bb211aefd040319ac
focus/klar-v133.0: a3372669a06fa684d3c5945c317d6787e3125303
focus/klar-v134.0: be550d94c2c7bc8b8902cdf7fe542a64e73a381a
main: 782d7a4b0ef7eadb70c56eb9486f3f6261b76468
main: e93ef9d136efb9719311f3f51a24748d1e850bb3
release/v124: da250bed9e19c4978d4400d6d404cb312e33636e
release/v125: a3e1e0773a00009e08d95726fd518ab642255ccd
release/v126: 6f305409b4af68e8404401a2caad8cb0da9a0494
Expand All @@ -24,5 +24,5 @@ release/v130: a48ec1b1f0219e1987bb38bc4f6b838f37dc6f12
release/v131: 7444df581b62d357df12ddc3c90d821d940efbb8
release/v132: cb318d0061ec6354167ecc1968020d5d75f1bffc
release/v133: 7c651ce29e94c6389af7a69ec6b5c44251976e92
release/v134: 846f290dfd0627f1873a524da439ebd7a1a4a932
release/v134: 83fa5a2cbf8a2671f7c7e7c7cb60ab219e782ec8
release/v135: 97d52f4eb357afc7cc73dfdf94ab6a585da2cf12
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
main: 782d7a4b0ef7eadb70c56eb9486f3f6261b76468
main: e93ef9d136efb9719311f3f51a24748d1e850bb3
release/v117: 43b690c450066d4dde1b2ccb93ed3714d244d502
release/v118: 89a7ea3c3372e5a4ef5b3c5b85499d26198d0524
release/v119: 7dc381f991c6d2a983c3ba7f0cffd880e8c29e7b
Expand All @@ -16,7 +16,7 @@ release/v130: a48ec1b1f0219e1987bb38bc4f6b838f37dc6f12
release/v131: 7444df581b62d357df12ddc3c90d821d940efbb8
release/v132: cb318d0061ec6354167ecc1968020d5d75f1bffc
release/v133: 7c651ce29e94c6389af7a69ec6b5c44251976e92
release/v134: 846f290dfd0627f1873a524da439ebd7a1a4a932
release/v134: 83fa5a2cbf8a2671f7c7e7c7cb60ab219e782ec8
release/v135: 97d52f4eb357afc7cc73dfdf94ab6a585da2cf12
v117.0: 3b275ab1e4ccef769d84437033c0c68acfd2df8a
v117.1: 55ddcf473a65d106d43f6d2ae5af4076d6d03688
Expand Down

0 comments on commit 8d48b8f

Please sign in to comment.