Skip to content

Commit

Permalink
Merge branch 'main' into fix/instance-render-target-lifetime
Browse files Browse the repository at this point in the history
  • Loading branch information
ian-h-chamberlain authored Feb 4, 2024
2 parents 7608d45 + f217e36 commit c92ee74
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 1 deletion.
4 changes: 3 additions & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- main
pull_request:
workflow_dispatch:

jobs:
Expand All @@ -22,7 +23,7 @@ jobs:

- uses: rust3ds/test-runner/setup@v1
with:
toolchain: nightly
toolchain: nightly-2023-06-01

- name: Build workspace docs
run: cargo 3ds --verbose doc --verbose --no-deps --workspace
Expand All @@ -47,6 +48,7 @@ jobs:
deploy:
runs-on: ubuntu-latest
needs: build
if: github.ref_name == 'main'
permissions:
pages: write
id-token: write
Expand Down
7 changes: 7 additions & 0 deletions citro3d-sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
#![allow(non_upper_case_globals)]
#![allow(non_camel_case_types)]
#![allow(clippy::all)]
#![doc(html_root_url = "https://rust3ds.github.io/citro3d-rs/crates")]
#![doc(
html_favicon_url = "https://user-images.githubusercontent.com/11131775/225929072-2fa1741c-93ae-4b47-9bdf-af70f3d59910.png"
)]
#![doc(
html_logo_url = "https://user-images.githubusercontent.com/11131775/225929072-2fa1741c-93ae-4b47-9bdf-af70f3d59910.png"
)]

include!(concat!(env!("OUT_DIR"), "/bindings.rs"));

Expand Down
7 changes: 7 additions & 0 deletions citro3d/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
#![test_runner(test_runner::run_gdb)]
#![feature(doc_cfg)]
#![feature(doc_auto_cfg)]
#![doc(html_root_url = "https://rust3ds.github.io/citro3d-rs/crates")]
#![doc(
html_favicon_url = "https://user-images.githubusercontent.com/11131775/225929072-2fa1741c-93ae-4b47-9bdf-af70f3d59910.png"
)]
#![doc(
html_logo_url = "https://user-images.githubusercontent.com/11131775/225929072-2fa1741c-93ae-4b47-9bdf-af70f3d59910.png"
)]

//! Safe Rust bindings to `citro3d`. This crate wraps `citro3d-sys` to provide
//! safer APIs for graphics programs targeting the 3DS.
Expand Down

0 comments on commit c92ee74

Please sign in to comment.