Skip to content

Commit

Permalink
CI: Check MSRV without git feature enabled
Browse files Browse the repository at this point in the history
git2-rs MSRV policy is to only support latest stable rust (see
https://github.com/rust-lang/git2-rs#rust-version-requirements), so it
does not make sense to run our MSRV tests with git enabled.
  • Loading branch information
Enselic committed Aug 25, 2022
1 parent 020492f commit 621ab60
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/CICD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ jobs:
min_version:
name: Minimum supported rust version
runs-on: ubuntu-20.04
env:
MSRV_FEATURES: --no-default-features --features minimal-application,bugreport,build-assets
steps:
- name: Checkout source code
uses: actions/checkout@v2
Expand All @@ -54,12 +56,12 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: clippy
args: --locked --all-targets --all-features
args: --locked --all-targets ${{ env.MSRV_FEATURES }}
- name: Run tests
uses: actions-rs/cargo@v1
with:
command: test
args: --locked
args: --locked ${{ env.MSRV_FEATURES }}

test_with_new_syntaxes_and_themes:
name: Run tests with updated syntaxes and themes
Expand Down
3 changes: 3 additions & 0 deletions tests/integration_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -987,6 +987,7 @@ fn header_full_binary() {
}

#[test]
#[cfg(feature = "git")] // Expected output assumes git is enabled
fn header_default() {
bat()
.arg("--paging=never")
Expand All @@ -1011,6 +1012,7 @@ fn header_default() {
}

#[test]
#[cfg(feature = "git")] // Expected output assumes git is enabled
fn header_default_is_default() {
bat()
.arg("--paging=never")
Expand Down Expand Up @@ -1373,6 +1375,7 @@ fn plain_mode_does_not_add_nonexisting_newline() {

// Regression test for https://github.com/sharkdp/bat/issues/299
#[test]
#[cfg(feature = "git")] // Expected output assumes git is enabled
fn grid_for_file_without_newline() {
bat()
.arg("--paging=never")
Expand Down
6 changes: 3 additions & 3 deletions tests/snapshot_tests.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#[cfg(feature = "git")]
mod tester;

use crate::tester::BatTester;

macro_rules! snapshot_tests {
($($test_name: ident: $style: expr,)*) => {
$(
#[test]
#[cfg(feature = "git")]
fn $test_name() {
let bat_tester = BatTester::default();
let bat_tester = tester::BatTester::default();
bat_tester.test_snapshot(stringify!($test_name), $style);
}
)*
Expand Down

0 comments on commit 621ab60

Please sign in to comment.