From 2a196179df9298371d2b6bc6870e9669c2044424 Mon Sep 17 00:00:00 2001 From: Raffaele Ragni Date: Mon, 25 Sep 2023 19:56:24 +0200 Subject: [PATCH 1/6] build system --- .github/workflows/build.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..59bf64c --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,30 @@ +name: Build +on: + push: + branches: + - "main" + paths-ignore: + - "/docs" + - "README.md" + pull_request: + paths-ignore: + - "/docs" + - "README.md" +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: "Checkout" + uses: actions/checkout@v3 + - name: "Cache" + uses: Swatinem/rust-cache@v2 + - name: "External dependencies" + run: sudo apt-get install -y libasound2-dev portaudio19-dev build-essential libpulse-dev libdbus-1-dev libudev-dev + - name: "Checks" + run: | + cargo fmt --check + cargo clippy --no-deps --tests -- -D warnings + cargo rustdoc -- -D warnings + - name: "Test" + run: | + cargo test --verbose From 4fce301f02c6a6c008635b4fcb2496375d85d294 Mon Sep 17 00:00:00 2001 From: Raffaele Ragni Date: Mon, 25 Sep 2023 19:57:57 +0200 Subject: [PATCH 2/6] optional checks --- .github/workflows/build.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 59bf64c..b72c714 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,9 +22,12 @@ jobs: run: sudo apt-get install -y libasound2-dev portaudio19-dev build-essential libpulse-dev libdbus-1-dev libudev-dev - name: "Checks" run: | - cargo fmt --check - cargo clippy --no-deps --tests -- -D warnings - cargo rustdoc -- -D warnings + #cargo fmt --check + #cargo clippy --no-deps --tests -- -D warnings + #cargo rustdoc -- -D warnings + - name: "Build" + run: | + cargo build - name: "Test" run: | cargo test --verbose From c3cb0638d992decb382eae27239e876ce7a6a67f Mon Sep 17 00:00:00 2001 From: Raffaele Ragni Date: Mon, 25 Sep 2023 19:59:44 +0200 Subject: [PATCH 3/6] also build examples --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b72c714..89bac84 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,6 +28,7 @@ jobs: - name: "Build" run: | cargo build + cargo build --examples - name: "Test" run: | cargo test --verbose From a8d98f677a9ab826767e8a5ce8e9d3b9b2aedb11 Mon Sep 17 00:00:00 2001 From: Raffaele Ragni Date: Mon, 25 Sep 2023 20:13:21 +0200 Subject: [PATCH 4/6] also refresh crates by hash --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 89bac84..b254df5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,6 +22,7 @@ jobs: run: sudo apt-get install -y libasound2-dev portaudio19-dev build-essential libpulse-dev libdbus-1-dev libudev-dev - name: "Checks" run: | + cargo update #cargo fmt --check #cargo clippy --no-deps --tests -- -D warnings #cargo rustdoc -- -D warnings From fdf79a5373afe1f6a0ab5afd89d45986cb0a0be8 Mon Sep 17 00:00:00 2001 From: Raffaele Ragni Date: Mon, 25 Sep 2023 23:54:26 +0200 Subject: [PATCH 5/6] use latest pr hash --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 58c5101..76daa25 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ anyhow = "1.0.75" ash = "0.37.3" bevy = { git = "https://github.com/awtterpip/bevy", default-features = false, features = [ "bevy_render", -], rev = "ac28b11797c0a85b431ee4940c6afa434f712f7a" } +], rev = "98f3b8ae207deb440f7255b3d900e7e01b6df0cb" } openxr = { version = "0.17.1", features = ["mint"] } mint = "0.5.9" wgpu = "0.16.0" @@ -20,7 +20,7 @@ wgpu-core = { version = "0.16.0", features = ["vulkan"] } wgpu-hal = "0.16.0" [dev-dependencies] -bevy = { git = "https://github.com/awtterpip/bevy", rev = "ac28b11797c0a85b431ee4940c6afa434f712f7a" } +bevy = { git = "https://github.com/awtterpip/bevy", rev = "98f3b8ae207deb440f7255b3d900e7e01b6df0cb" } color-eyre = "0.6.2" [[example]] From 14785c73b3fe4930f89ec3acc50d99da875eca24 Mon Sep 17 00:00:00 2001 From: Raffaele Ragni Date: Tue, 26 Sep 2023 00:15:00 +0200 Subject: [PATCH 6/6] fix build --- Cargo.toml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 76daa25..e6973e2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,9 +10,7 @@ linked = ["openxr/linked", "openxr/static"] [dependencies] anyhow = "1.0.75" ash = "0.37.3" -bevy = { git = "https://github.com/awtterpip/bevy", default-features = false, features = [ - "bevy_render", -], rev = "98f3b8ae207deb440f7255b3d900e7e01b6df0cb" } +bevy = { git = "https://github.com/awtterpip/bevy", rev = "98f3b8ae207deb440f7255b3d900e7e01b6df0cb" } openxr = { version = "0.17.1", features = ["mint"] } mint = "0.5.9" wgpu = "0.16.0"