Skip to content

Commit a828e32

Browse files
JohnTitorJohnTitor
authored
Merge pull request #50 from JohnTitor/tweak-gha
2 parents 737cdb1 + 27c4d79 commit a828e32

File tree

3 files changed

+36
-39
lines changed

3 files changed

+36
-39
lines changed

‎.env‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
MDBOOK_VERSION=0.4.18
2-
MDBOOK_LINKCHECK_VERSION=0.7.4
3-
MDBOOK_TOC_VERSION=0.6.3
1+
MDBOOK_VERSION=0.4.25
2+
MDBOOK_LINKCHECK_VERSION=0.7.7
3+
MDBOOK_TOC_VERSION=0.11.0
44

55
GIT_DEPLOY_DIR=book/html
66
GIT_DEPLOY_BRANCH=gh-pages

‎.github/workflows/ci.yml‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,35 @@ on:
77

88
jobs:
99
book-test:
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-22.04
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v3
1313

1414
- name: Read .env
1515
id: mdbook-version
1616
run: |
1717
. ./.env
18-
echo "::set-output name=MDBOOK_VERSION::${MDBOOK_VERSION}"
19-
echo "::set-output name=MDBOOK_LINKCHECK_VERSION::${MDBOOK_LINKCHECK_VERSION}"
20-
echo "::set-output name=MDBOOK_TOC_VERSION::${MDBOOK_TOC_VERSION}"
21-
18+
echo "MDBOOK_VERSION=${MDBOOK_VERSION}" >> $GITHUB_OUTPUT
19+
echo "MDBOOK_LINKCHECK_VERSION=${MDBOOK_LINKCHECK_VERSION}" >> $GITHUB_OUTPUT
20+
echo "MDBOOK_TOC_VERSION=${MDBOOK_TOC_VERSION}" >> $GITHUB_OUTPUT
21+
2222
- name: Cache binaries
2323
id: mdbook-cache
24-
uses: actions/cache@v2
24+
uses: actions/cache@v3
2525
with:
2626
path: |
2727
~/.cargo/bin
2828
key: ${{ runner.os }}-${{ steps.mdbook-version.outputs.MDBOOK_VERSION }}--${{ steps.mdbook-version.outputs.MDBOOK_LINKCHECK_VERSION }}--${{ steps.mdbook-version.outputs.MDBOOK_TOC_VERSION }}
2929

3030
- name: Install latest stable Rust toolchain
3131
if: steps.mdbook-cache.outputs.cache-hit != 'true'
32-
uses: actions-rs/toolchain@v1
33-
with:
34-
toolchain: stable
35-
override: true
32+
run: |
33+
rustup update stable
34+
rustup override set stable
3635
3736
- name: Install Dependencies
3837
if: steps.mdbook-cache.outputs.cache-hit != 'true'
39-
run: |
38+
run: |
4039
cargo install mdbook --version ${{ steps.mdbook-version.outputs.MDBOOK_VERSION }}
4140
cargo install mdbook-linkcheck --version ${{ steps.mdbook-version.outputs.MDBOOK_LINKCHECK_VERSION }}
4241
cargo install mdbook-toc --version ${{ steps.mdbook-version.outputs.MDBOOK_TOC_VERSION }}
@@ -45,36 +44,35 @@ jobs:
4544
run: mdbook test
4645

4746
book-build:
48-
runs-on: ubuntu-20.04
47+
runs-on: ubuntu-22.04
4948
steps:
50-
- uses: actions/checkout@v2
49+
- uses: actions/checkout@v3
5150

5251
- name: Read .env
5352
id: mdbook-version
5453
run: |
5554
. ./.env
56-
echo "::set-output name=MDBOOK_VERSION::${MDBOOK_VERSION}"
57-
echo "::set-output name=MDBOOK_LINKCHECK_VERSION::${MDBOOK_LINKCHECK_VERSION}"
58-
echo "::set-output name=MDBOOK_TOC_VERSION::${MDBOOK_TOC_VERSION}"
59-
55+
echo "MDBOOK_VERSION=${MDBOOK_VERSION}" >> $GITHUB_OUTPUT
56+
echo "MDBOOK_LINKCHECK_VERSION=${MDBOOK_LINKCHECK_VERSION}" >> $GITHUB_OUTPUT
57+
echo "MDBOOK_TOC_VERSION=${MDBOOK_TOC_VERSION}" >> $GITHUB_OUTPUT
58+
6059
- name: Cache binaries
6160
id: mdbook-cache
62-
uses: actions/cache@v2
61+
uses: actions/cache@v3
6362
with:
6463
path: |
6564
~/.cargo/bin
6665
key: ${{ runner.os }}-${{ steps.mdbook-version.outputs.MDBOOK_VERSION }}--${{ steps.mdbook-version.outputs.MDBOOK_LINKCHECK_VERSION }}--${{ steps.mdbook-version.outputs.MDBOOK_TOC_VERSION }}
6766

6867
- name: Install latest stable Rust toolchain
6968
if: steps.mdbook-cache.outputs.cache-hit != 'true'
70-
uses: actions-rs/toolchain@v1
71-
with:
72-
toolchain: stable
73-
override: true
69+
run: |
70+
rustup update stable
71+
rustup override set stable
7472
7573
- name: Install Dependencies
7674
if: steps.mdbook-cache.outputs.cache-hit != 'true'
77-
run: |
75+
run: |
7876
cargo install mdbook --version ${{ steps.mdbook-version.outputs.MDBOOK_VERSION }}
7977
cargo install mdbook-linkcheck --version ${{ steps.mdbook-version.outputs.MDBOOK_LINKCHECK_VERSION }}
8078
cargo install mdbook-toc --version ${{ steps.mdbook-version.outputs.MDBOOK_TOC_VERSION }}

‎.github/workflows/gh-pages.yml‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,35 @@ on:
77

88
jobs:
99
deploy:
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-22.04
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v3
1313

1414
- name: Read .env
1515
id: mdbook-version
1616
run: |
1717
. ./.env
18-
echo "::set-output name=MDBOOK_VERSION::${MDBOOK_VERSION}"
19-
echo "::set-output name=MDBOOK_LINKCHECK_VERSION::${MDBOOK_LINKCHECK_VERSION}"
20-
echo "::set-output name=MDBOOK_TOC_VERSION::${MDBOOK_TOC_VERSION}"
21-
18+
echo "MDBOOK_VERSION=${MDBOOK_VERSION}" >> $GITHUB_OUTPUT
19+
echo "MDBOOK_LINKCHECK_VERSION=${MDBOOK_LINKCHECK_VERSION}" >> $GITHUB_OUTPUT
20+
echo "MDBOOK_TOC_VERSION=${MDBOOK_TOC_VERSION}" >> $GITHUB_OUTPUT
21+
2222
- name: Cache binaries
2323
id: mdbook-cache
24-
uses: actions/cache@v2
24+
uses: actions/cache@v3
2525
with:
2626
path: |
2727
~/.cargo/bin
2828
key: ${{ runner.os }}-${{ steps.mdbook-version.outputs.MDBOOK_VERSION }}--${{ steps.mdbook-version.outputs.MDBOOK_LINKCHECK_VERSION }}--${{ steps.mdbook-version.outputs.MDBOOK_TOC_VERSION }}
2929

3030
- name: Install latest stable Rust toolchain
3131
if: steps.mdbook-cache.outputs.cache-hit != 'true'
32-
uses: actions-rs/toolchain@v1
33-
with:
34-
toolchain: stable
35-
override: true
32+
run: |
33+
rustup update stable
34+
rustup override set stable
3635
3736
- name: Install Dependencies
3837
if: steps.mdbook-cache.outputs.cache-hit != 'true'
39-
run: |
38+
run: |
4039
cargo install mdbook --version ${{ steps.mdbook-version.outputs.MDBOOK_VERSION }}
4140
cargo install mdbook-linkcheck --version ${{ steps.mdbook-version.outputs.MDBOOK_LINKCHECK_VERSION }}
4241
cargo install mdbook-toc --version ${{ steps.mdbook-version.outputs.MDBOOK_TOC_VERSION }}

0 commit comments

Comments
 (0)