diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 86bb79e..c163571 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,27 +32,17 @@ jobs: uses: actions/checkout@v2 # Dependencies - name: Install Rust - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: toolchain: ${{ env.RUST_VERSION }} - components: clippy, rustfmt # Test - name: Cargo Test - uses: actions-rs/cargo@v1 - with: - command: test - args: --verbose --all-features + run: cargo test --verbose --all-features # Test (no_std) - name: Cargo Build (vulkanalia-sys/no_std) - uses: actions-rs/cargo@v1 - with: - command: build - args: --manifest-path vulkanalia-sys/Cargo.toml --no-default-features + run: cargo build --manifest-path vulkanalia-sys/Cargo.toml --no-default-features - name: Cargo Build (vulkanalia/no_std) - uses: actions-rs/cargo@v1 - with: - command: build - args: --manifest-path vulkanalia/Cargo.toml --no-default-features + run: cargo build --manifest-path vulkanalia/Cargo.toml --no-default-features # Debug - name: Debug uses: mxschmitt/action-tmate@v3 @@ -70,16 +60,13 @@ jobs: uses: actions/checkout@v2 # Dependencies - name: Install Rust - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: toolchain: ${{ env.RUST_VERSION }} - components: clippy, rustfmt + components: rustfmt # Format - name: Cargo Format - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --verbose -- --check + run: cargo fmt --verbose -- --check clippy-vulkanalia: name: Clippy - Vulkanalia @@ -93,15 +80,13 @@ jobs: uses: actions/checkout@v2 # Dependencies - name: Install Rust - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: toolchain: ${{ env.RUST_VERSION }} - components: clippy, rustfmt + components: clippy # Clippy - name: Cargo Clippy - uses: actions-rs/clippy-check@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} + run: cargo clippy check-generator: name: Check - Generator @@ -141,21 +126,19 @@ jobs: with: java-version: 14 - name: Install Rust - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: toolchain: ${{ env.RUST_VERSION }} - - name: Cache bindgen + components: rustfmt + - name: Cache Bindgen id: cache-bindgen uses: actions/cache@v2 with: path: ~/.cargo/bin/bindgen key: ${{ runner.os }}-${{ env.RUST_VERSION }}-${{ env.BINDGEN_VERSION }} - - name: Install bindgen - uses: actions-rs/cargo@v1 + - name: Install Bindgen if: steps.cache-bindgen.outputs.cache-hit != 'true' - with: - command: install - args: bindgen-cli --version ${{ env.BINDGEN_VERSION }} + run: cargo install bindgen-cli --version ${{ env.BINDGEN_VERSION }} # Check - name: Check Bindings working-directory: ./generator @@ -163,4 +146,4 @@ jobs: # Debug - name: Debug uses: mxschmitt/action-tmate@v3 - if: ${{ failure() }} + if: ${{ (failure() && inputs.error_debug) || inputs.force_debug }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6dfe7ab..8d1ec7e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest env: RUST_LOG: info - RUST_VERSION: 1.64.0 + RUST_VERSION: 1.65.0 MDBOOK_VERSION: 0.4.21 steps: # Checkout @@ -34,9 +34,10 @@ jobs: with: java-version: 14 - name: Install Rust - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: toolchain: ${{ env.RUST_VERSION }} + components: rustfmt - name: Cache mdbook id: cache-mdbook uses: actions/cache@v2 @@ -44,11 +45,8 @@ jobs: path: ~/.cargo/bin/mdbook key: ${{ runner.os }}-${{ env.RUST_VERSION }}-${{ env.MDBOOK_VERSION }} - name: Install mdbook - uses: actions-rs/cargo@v1 if: steps.cache-mdbook.outputs.cache-hit != 'true' - with: - command: install - args: mdbook --version ${{ env.MDBOOK_VERSION }} --no-default-features + run: cargo install mdbook --version ${{ env.MDBOOK_VERSION }} --no-default-features # Publish - name: Build Index working-directory: ./generator @@ -60,11 +58,8 @@ jobs: path: ~/.cargo/bin/vk-preprocessor key: ${{ hashFiles('index.txt', 'tutorial/book/preprocessor/**') }} - name: Build Preprocessor - uses: actions-rs/cargo@v1 if: steps.cache-preprocessor.outputs.cache-hit != 'true' - with: - command: install - args: --path ./tutorial/book/preprocessor + run: cargo install --path ./tutorial/book/preprocessor - name: Build Tutorial working-directory: ./tutorial/book run: mdbook build diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 78071c1..8cf073e 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -37,21 +37,19 @@ jobs: with: java-version: 14 - name: Install Rust - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: toolchain: ${{ env.RUST_VERSION }} - - name: Cache bindgen + components: rustfmt + - name: Cache Bindgen id: cache-bindgen uses: actions/cache@v2 with: path: ~/.cargo/bin/bindgen key: ${{ runner.os }}-${{ env.RUST_VERSION }}-${{ env.BINDGEN_VERSION }} - - name: Install bindgen - uses: actions-rs/cargo@v1 + - name: Install Bindgen if: steps.cache-bindgen.outputs.cache-hit != 'true' - with: - command: install - args: bindgen-cli --version ${{ env.BINDGEN_VERSION }} + run: cargo install bindgen-cli --version ${{ env.BINDGEN_VERSION }} # Update - name: Update Bindings working-directory: ./generator