ci: update github-ci and suppress info logs
This commit is contained in:
parent
7a3a690166
commit
8ba4b72cf1
6 changed files with 40 additions and 15 deletions
6
.github/workflows/build.yml
vendored
6
.github/workflows/build.yml
vendored
|
@ -30,7 +30,7 @@ jobs:
|
||||||
name: ${{ matrix.output }} (${{ matrix.profile }})
|
name: ${{ matrix.output }} (${{ matrix.profile }})
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
- name: Install nightly Rust
|
- name: Install nightly Rust
|
||||||
uses: dtolnay/rust-toolchain@master
|
uses: dtolnay/rust-toolchain@master
|
||||||
with:
|
with:
|
||||||
|
@ -51,7 +51,7 @@ jobs:
|
||||||
name: aarch64-ubuntu
|
name: aarch64-ubuntu
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
- name: Install nightly Rust
|
- name: Install nightly Rust
|
||||||
uses: dtolnay/rust-toolchain@master
|
uses: dtolnay/rust-toolchain@master
|
||||||
with:
|
with:
|
||||||
|
@ -82,7 +82,7 @@ jobs:
|
||||||
name: aarch64-windows
|
name: aarch64-windows
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
- name: Install nightly Rust
|
- name: Install nightly Rust
|
||||||
uses: dtolnay/rust-toolchain@master
|
uses: dtolnay/rust-toolchain@master
|
||||||
with:
|
with:
|
||||||
|
|
2
.github/workflows/package-obs.yml
vendored
2
.github/workflows/package-obs.yml
vendored
|
@ -40,7 +40,7 @@ jobs:
|
||||||
options: --privileged
|
options: --privileged
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
- name: Install OSC and dependencies
|
- name: Install OSC and dependencies
|
||||||
env:
|
env:
|
||||||
OBS_CONFIG: ${{ secrets.OBS_CONFIG }}
|
OBS_CONFIG: ${{ secrets.OBS_CONFIG }}
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
name: integration test shader reflection
|
name: integration test shader reflection
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
|
||||||
branches: [ "master" ]
|
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [ "master" ]
|
branches: [ "master" ]
|
||||||
env:
|
env:
|
||||||
|
@ -14,7 +12,7 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Approve
|
- name: Approve
|
||||||
run: echo Full test suite needs approval by a maintainer
|
run: echo Full test suite for PRs needs approval by a maintainer
|
||||||
test:
|
test:
|
||||||
environment:
|
environment:
|
||||||
name: full-test
|
name: full-test
|
||||||
|
@ -23,13 +21,12 @@ jobs:
|
||||||
continue-on-error: false
|
continue-on-error: false
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
- name: Install nightly Rust
|
- name: Install nightly Rust
|
||||||
uses: dtolnay/rust-toolchain@nightly
|
uses: dtolnay/rust-toolchain@nightly
|
||||||
with:
|
with:
|
||||||
toolchain: nightly
|
toolchain: nightly
|
||||||
override: true
|
|
||||||
- name: Test
|
- name: Test
|
||||||
run: cargo test -p librashader --features=github-ci --test reflect -- --nocapture
|
run: cargo test -p librashader --features=github-ci --test reflect -- --nocapture
|
2
.github/workflows/publish-obs.yml
vendored
2
.github/workflows/publish-obs.yml
vendored
|
@ -28,7 +28,7 @@ jobs:
|
||||||
options: --privileged
|
options: --privileged
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
- name: Install OSC and dependencies
|
- name: Install OSC and dependencies
|
||||||
env:
|
env:
|
||||||
OBS_CONFIG: ${{ secrets.OBS_CONFIG }}
|
OBS_CONFIG: ${{ secrets.OBS_CONFIG }}
|
||||||
|
|
24
.github/workflows/push-full-test.yml
vendored
Normal file
24
.github/workflows/push-full-test.yml
vendored
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
name: integration test shader reflection
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [ "master" ]
|
||||||
|
schedule:
|
||||||
|
- cron: "0 0 * * 6"
|
||||||
|
env:
|
||||||
|
CARGO_TERM_COLOR: always
|
||||||
|
jobs:
|
||||||
|
test:
|
||||||
|
runs-on: windows-latest
|
||||||
|
continue-on-error: false
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
submodules: recursive
|
||||||
|
- name: Install nightly Rust
|
||||||
|
uses: dtolnay/rust-toolchain@nightly
|
||||||
|
with:
|
||||||
|
toolchain: nightly
|
||||||
|
- name: Test
|
||||||
|
run: cargo test -p librashader --features=github-ci --test reflect -- --nocapture
|
|
@ -27,13 +27,14 @@ fn collect_all_slang_presets() -> Vec<(PathBuf, ShaderPreset)> {
|
||||||
if let Ok(path) = entry {
|
if let Ok(path) = entry {
|
||||||
match ShaderPreset::try_parse(&path) {
|
match ShaderPreset::try_parse(&path) {
|
||||||
Ok(preset) => {
|
Ok(preset) => {
|
||||||
|
#[cfg(not(feature = "github-ci"))]
|
||||||
println!("[INFO] Parsing preset {path:?}");
|
println!("[INFO] Parsing preset {path:?}");
|
||||||
return Some((path, preset));
|
return Some((path, preset));
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
#[cfg(feature = "github-ci")]
|
#[cfg(feature = "github-ci")]
|
||||||
println!(
|
println!(
|
||||||
"::warning file={},title=Failed to parse preset::{e:?}",
|
"::warning title=Failed to parse preset::{e:?} ({})",
|
||||||
path.display()
|
path.display()
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -65,6 +66,7 @@ pub fn preprocess_all_slang_presets_parsed() {
|
||||||
for (path, preset) in presets {
|
for (path, preset) in presets {
|
||||||
preset.shaders.into_par_iter().for_each(|shader| {
|
preset.shaders.into_par_iter().for_each(|shader| {
|
||||||
if let Err(e) = ShaderSource::load(&shader.name) {
|
if let Err(e) = ShaderSource::load(&shader.name) {
|
||||||
|
#[cfg(not(feature = "github-ci"))]
|
||||||
eprintln!(
|
eprintln!(
|
||||||
"[ERROR] Failed to preprocess shader {} from preset {}: {:?}",
|
"[ERROR] Failed to preprocess shader {} from preset {}: {:?}",
|
||||||
shader.name.display(),
|
shader.name.display(),
|
||||||
|
@ -74,7 +76,7 @@ pub fn preprocess_all_slang_presets_parsed() {
|
||||||
|
|
||||||
#[cfg(feature = "github-ci")]
|
#[cfg(feature = "github-ci")]
|
||||||
println!(
|
println!(
|
||||||
"::warning file={},title=Failed to preprocess shader::{e:?}",
|
"::warning title=Failed to preprocess shader::{e:?}, ({})",
|
||||||
path.display()
|
path.display()
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -126,6 +128,7 @@ where
|
||||||
{
|
{
|
||||||
let presets = ALL_SLANG_PRESETS.read().unwrap();
|
let presets = ALL_SLANG_PRESETS.read().unwrap();
|
||||||
presets.par_iter().for_each(|(path, preset)| {
|
presets.par_iter().for_each(|(path, preset)| {
|
||||||
|
#[cfg(not(feature = "github-ci"))]
|
||||||
println!(
|
println!(
|
||||||
"[INFO] Compiling {} into {} reflecting with {}",
|
"[INFO] Compiling {} into {} reflecting with {}",
|
||||||
path.display(),
|
path.display(),
|
||||||
|
@ -136,14 +139,15 @@ where
|
||||||
preset.shaders.clone(),
|
preset.shaders.clone(),
|
||||||
&preset.textures,
|
&preset.textures,
|
||||||
) {
|
) {
|
||||||
|
#[cfg(not(feature = "github-ci"))]
|
||||||
eprintln!("[ERROR] {:?} ({path:?})", e);
|
eprintln!("[ERROR] {:?} ({path:?})", e);
|
||||||
|
|
||||||
#[cfg(feature = "github-ci")]
|
#[cfg(feature = "github-ci")]
|
||||||
println!(
|
println!(
|
||||||
"::warning file={},title=Failed to reflect {} with {}::{e:?}",
|
"::warning title=Failed to reflect {} with {}::{e:?} ({})",
|
||||||
path.display(),
|
|
||||||
O::DEBUG,
|
O::DEBUG,
|
||||||
R::DEBUG
|
R::DEBUG,
|
||||||
|
path.display()
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Add table
Reference in a new issue