豆豆友情提示:这是一个非官方 GitHub 代理镜像,主要用于网络测试或访问加速。请勿在此进行登录、注册或处理任何敏感信息。进行这些操作请务必访问官方网站 github.com。 Raw 内容也通过此代理提供。
Skip to content

Commit 23cd3ba

Browse files
committed
Merge remote-tracking branch 'origin/beta' into release
2 parents 5a4c083 + 6c32c95 commit 23cd3ba

File tree

1,081 files changed

+20709
-9682
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,081 files changed

+20709
-9682
lines changed

.github/actions/setup-gradle/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ runs:
2121
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
2222

2323
- name: Set up JDK
24-
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
24+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2525
with:
2626
distribution: 'temurin'
2727
java-version: '21'

.github/dependabot.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ updates:
33
# Dependabot does not support GitHub composite actions by default (.github/actions)
44
# so we need to add the folder by hand to the directories entry.
55
- package-ecosystem: "github-actions"
6+
open-pull-requests-limit: 10
67
directories:
78
- "/"
89
- "/.github/actions/*"
@@ -15,6 +16,7 @@ updates:
1516
prefix: chore
1617
include: scope
1718
- package-ecosystem: "gradle"
19+
open-pull-requests-limit: 20
1820
directory: "/"
1921
schedule:
2022
interval: "weekly"

.github/workflows/build-android.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
steps:
3232
- name: Checkout the repo
33-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
33+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3434
with:
3535
fetch-depth: 1
3636

@@ -61,7 +61,7 @@ jobs:
6161
needs: [build-common]
6262
steps:
6363
- name: Checkout the repo
64-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
64+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6565
with:
6666
fetch-depth: 1
6767

@@ -85,7 +85,7 @@ jobs:
8585
needs: [build-common]
8686
steps:
8787
- name: Checkout the repo
88-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
88+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
8989
with:
9090
fetch-depth: 1
9191

@@ -113,7 +113,7 @@ jobs:
113113
needs: [build-common]
114114
steps:
115115
- name: Checkout the repo
116-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
116+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
117117
with:
118118
fetch-depth: 1
119119

@@ -130,7 +130,7 @@ jobs:
130130
needs: [build-common]
131131
steps:
132132
- name: Checkout the repo
133-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
133+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
134134
with:
135135
fetch-depth: 1
136136

@@ -147,7 +147,7 @@ jobs:
147147
needs: [build-common]
148148
steps:
149149
- name: Checkout the repo
150-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
150+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
151151
with:
152152
fetch-depth: 1
153153

.github/workflows/build-cli-tools.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
timeout-minutes: 30
2525
steps:
2626
- name: Checkout the repo
27-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
27+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2828
with:
2929
fetch-depth: 1
3030

.github/workflows/dependabot-dependency-guard-update.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@ concurrency:
2020

2121
jobs:
2222
update-dependency-guard:
23-
if: github.actor == 'dependabot[bot]'
23+
if: github.actor == 'dependabot[bot]' && github.event.pull_request.head.repo.full_name == 'thunderbird/thunderbird-android'
2424
runs-on: ubuntu-latest
2525
environment: botmobile
2626
timeout-minutes: 90
2727
steps:
2828
- name: App Token Generate
29-
uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
29+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
3030
if: ${{ vars.BOT_CLIENT_ID }}
3131
id: app-token
3232
with:
3333
app-id: ${{ vars.BOT_CLIENT_ID }}
3434
private-key: ${{ secrets.BOT_PRIVATE_KEY }}
3535

3636
- name: Checkout the repo
37-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
37+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3838
with:
3939
ref: ${{ github.head_ref }}
4040
token: ${{ steps.app-token.outputs.token || github.token }}

.github/workflows/deploy-docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ jobs:
2121
environment: botmobile
2222
steps:
2323
- name: App token generate
24-
uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
24+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
2525
if: ${{ vars.BOT_CLIENT_ID }}
2626
id: app-token
2727
with:
2828
app-id: ${{ vars.BOT_CLIENT_ID }}
2929
private-key: ${{ secrets.BOT_PRIVATE_KEY }}
3030

3131
- name: Checkout
32-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
32+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3333
with:
3434
token: ${{ steps.app-token.outputs.token || github.token }}
3535

.github/workflows/fluidscan.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- name: "Checkout code"
21-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
21+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
2222
with:
2323
persist-credentials: false
2424

@@ -27,14 +27,14 @@ jobs:
2727
bash scripts/ci/run-fluidattacks-scanner.sh
2828
2929
- name: "Upload scan results"
30-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
30+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
3131
with:
3232
name: SARIF scan results
3333
path: fluidscan-results.sarif
3434
retention-days: 5
3535

3636
# Upload the results to GitHub's code scanning dashboard.
3737
- name: "Upload to code-scanning"
38-
uses: github/codeql-action/upload-sarif@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
38+
uses: github/codeql-action/upload-sarif@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
3939
with:
4040
sarif_file: fluidscan-results.sarif

.github/workflows/markdown.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
17+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1818

1919
- name: Cargo cache
2020
uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c # v1.15.2

.github/workflows/needinfo-answered.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
pull-requests: write
2323
steps:
2424
- name: App token generate
25-
uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
25+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
2626
if: ${{ vars.BOT_CLIENT_ID }}
2727
id: app-token
2828
with:

.github/workflows/needinfo-remove.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
pull-requests: write
2525
steps:
2626
- name: App token generate
27-
uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
27+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
2828
if: ${{ vars.BOT_CLIENT_ID }}
2929
id: app-token
3030
with:

0 commit comments

Comments
 (0)