From 97d043d505c6f2f342c46bc5f7874c06aa9eaf17 Mon Sep 17 00:00:00 2001 From: Gwilym Kuiper Date: Sat, 5 Mar 2022 20:58:15 +0000 Subject: [PATCH 1/2] Use a setup-mdbook action --- .github/workflows/build-and-test.yml | 4 +++ .github/workflows/build-book.yml | 38 ---------------------------- .github/workflows/publish-agb.yml | 6 +++-- 3 files changed, 8 insertions(+), 40 deletions(-) delete mode 100644 .github/workflows/build-book.yml diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 5ef0378e..3b9016e2 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -33,5 +33,9 @@ jobs: - name: Install gbafix run: cargo install gbafix - uses: extractions/setup-just@v1 + - name: Setup mdBook + uses: peaceiris/actions-mdbook@v1 + with: + mdbook-version: '0.4.13' - name: Build and test all crates run: just ci \ No newline at end of file diff --git a/.github/workflows/build-book.yml b/.github/workflows/build-book.yml deleted file mode 100644 index e533deab..00000000 --- a/.github/workflows/build-book.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Build book - -on: - push: - branches: [ master ] - paths: - 'book/**' - pull_request: - branches: [ master ] - paths: - 'book/**' - -env: - CARGO_TERM_COLOR: always - -jobs: - build: - runs-on: ubuntu-20.04 - steps: - - name: Set CARGO_TARGET_DIR - run: echo "CARGO_TARGET_DIR=$HOME/target" >> $GITHUB_ENV - - name: Install build tools - run: sudo apt-get update && sudo apt-get install build-essential binutils-arm-none-eabi libelf-dev zip -y - - uses: actions/checkout@v3 - - name: Cache - uses: actions/cache@v2.1.7 - with: - path: | - ~/.cargo/registry - ~/.cargo/git - ~/target - key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - - - name: Install mdbook - run: cargo install mdbook - - name: Build the book - run: mdbook build - working-directory: book \ No newline at end of file diff --git a/.github/workflows/publish-agb.yml b/.github/workflows/publish-agb.yml index 2d7a6d29..681564e4 100644 --- a/.github/workflows/publish-agb.yml +++ b/.github/workflows/publish-agb.yml @@ -38,8 +38,10 @@ jobs: tag: ${{ github.ref }} overwrite: true - - name: Install mdbook - run: cargo install mdbook + - name: Setup mdBook + uses: peaceiris/actions-mdbook@v1 + with: + mdbook-version: '0.4.13' - name: Build the book run: just build-book - name: Deploy the book From cb0bcf7c6737f9db9e2f52a72adf24f3f65302ab Mon Sep 17 00:00:00 2001 From: Gwilym Kuiper Date: Sat, 5 Mar 2022 20:58:25 +0000 Subject: [PATCH 2/2] Add build-book to just ci --- justfile | 1 + 1 file changed, 1 insertion(+) diff --git a/justfile b/justfile index 0229f453..82e36a06 100644 --- a/justfile +++ b/justfile @@ -27,6 +27,7 @@ ci: && build-roms just _all-crates _test-debug just _all-crates _test-release just _all-crates _clippy + just build-book build-roms: just _build-rom "examples/the-purple-night" "PURPLENIGHT"