From 1973a2f3b7211b433fc95c82e5768c39b803b430 Mon Sep 17 00:00:00 2001 From: clabby Date: Mon, 12 Feb 2024 11:54:35 -0500 Subject: [PATCH] Fix book publish job (#15) --- .github/workflows/book.yaml | 18 ++++++------------ .github/workflows/ci.yaml | 6 +++--- .github/workflows/cross-docker.yaml | 5 +---- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/.github/workflows/book.yaml b/.github/workflows/book.yaml index 77252c49..8b6669d6 100644 --- a/.github/workflows/book.yaml +++ b/.github/workflows/book.yaml @@ -3,7 +3,6 @@ on: push: branches: - main - jobs: publish: runs-on: ubuntu-latest @@ -14,19 +13,14 @@ jobs: steps: - name: Checkout sources uses: actions/checkout@v4 - - name: Setup mdbook - uses: peaceiris/actions-mdbook@v1 - with: - mdbook-version: 'latest' - - name: Setup mdbook-mermaid - uses: magicgh/mdbook-mermaid-action@v1 + - name: Install Rust stable toolchain + uses: dtolnay/rust-toolchain@stable + - uses: Swatinem/rust-cache@v2 with: - version: 'latest' - - name: Install mdbook-template + cache-on-failure: true + - name: Setup mdbook run: | - mkdir mdbook-template - curl -sSL https://github.com/sgoudham/mdbook-template/releases/latest/download/mdbook-template-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook-template - echo `pwd`/mdbook-template >> $GITHUB_PATH + cargo install mdbook mdbook-mermaid mdbook-template - name: Build book working-directory: ./book run: mdbook build diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2f3d5caf..0a484b1c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ jobs: steps: - name: Checkout sources uses: actions/checkout@v4 - - name: Install Rust nightly toolchain + - name: Install Rust stable toolchain uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 with: @@ -41,7 +41,7 @@ jobs: steps: - name: Checkout sources uses: actions/checkout@v4 - - name: Install Rust nightly toolchain + - name: Install Rust stable toolchain uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 with: @@ -56,7 +56,7 @@ jobs: steps: - name: Checkout sources uses: actions/checkout@v4 - - name: Install Rust nightly toolchain + - name: Install Rust stable toolchain uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 with: diff --git a/.github/workflows/cross-docker.yaml b/.github/workflows/cross-docker.yaml index 88b42eb3..52e9765b 100644 --- a/.github/workflows/cross-docker.yaml +++ b/.github/workflows/cross-docker.yaml @@ -1,12 +1,9 @@ name: Build and Publish Cross Images - on: workflow_dispatch: workflow_call: - env: REGISTRY: ghcr.io - jobs: build-pipelines: runs-on: ubuntu-latest @@ -39,4 +36,4 @@ jobs: context: build/${{ matrix.target }} push: true tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} + labels: ${{ steps.meta.outputs.labels }}