Skip to content

Commit aaf1bfe

Browse files
kewischcoreycb
authored andcommitted
Merge pull request #8987 from kewisch/deploy-docs-fix
Fix deploy-docs job
1 parent 6bacf93 commit aaf1bfe

3 files changed

Lines changed: 23 additions & 19 deletions

File tree

.github/workflows/deploy-docs.yml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
name: Deploy docs
23

34
on:
@@ -22,18 +23,10 @@ jobs:
2223
runs-on: ubuntu-latest
2324
steps:
2425
- name: Checkout
25-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
26-
27-
- uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
28-
with:
29-
path: |
30-
~/.cargo/.crates.toml
31-
~/.cargo/.crates2.toml
32-
~/.cargo/bin/
33-
~/.cargo/registry/index/
34-
~/.cargo/registry/cache/
35-
~/.cargo/git/db/
36-
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
26+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
27+
28+
- name: Cargo cache
29+
uses: actions-rust-lang/setup-rust-toolchain@9399c7bb15d4c7d47b27263d024f0a4978346ba4 # v1.11.0
3730

3831
- name: Install mdbook and extensions
3932
run: ./docs/install.sh

.github/workflows/markdown.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,14 @@ jobs:
1313
markdown_quality:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
16+
- name: Checkout
17+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
18+
19+
- name: Cargo cache
20+
uses: actions-rust-lang/setup-rust-toolchain@9399c7bb15d4c7d47b27263d024f0a4978346ba4 # v1.11.0
21+
22+
- name: Install mdbook and extensions
23+
run: ./docs/install.sh
1724

1825
- name: Copy CI gradle.properties
1926
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
@@ -28,3 +35,6 @@ jobs:
2835

2936
- name: Quality - Spotless Markdown Check
3037
run: ./gradlew spotlessMarkdownCheck
38+
39+
- name: Test mdbook docs
40+
run: mdbook test docs

docs/ci/AUTOMATION.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ You will need the following files:
2424
- The signing keys with their default filenames
2525
- A matrix-account.json with the following keys:
2626

27-
```
27+
```json
2828
{
2929
"homeserver": "matrix-client.matrix.org",
3030
"room": "room id here",
@@ -33,7 +33,6 @@ You will need the following files:
3333
"github_username": "@matrix_id:mozilla.org"
3434
}
3535
}
36-
3736
```
3837

3938
- `play-store-account.json` with the service account json that will do the uploads
@@ -74,10 +73,12 @@ The environments are locked to the respective branch they belong to.
7473

7574
These environments contain the secrets for signing. Their names follow this pattern:
7675

77-
<appName>_<releaseType>_<packageFlavor>
78-
thunderbird_beta_full
79-
thunderbird_beta_foss
80-
k9mail_beta_foss
76+
```text
77+
<appName>_<releaseType>_<packageFlavor>
78+
thunderbird_beta_full
79+
thunderbird_beta_foss
80+
k9mail_beta_foss
81+
```
8182

8283
The following secrets are needed:
8384

0 commit comments

Comments
 (0)