From 1c700f4dfbe60d2cb30664e45c8318af5ff5f0f3 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 30 Apr 2024 19:52:02 -0400 Subject: [PATCH] Adjust skip_if_travis to be generic skip_if_ci and work on github osx as well Apparently that test was "always" skipped, so we will just do the same on github actions for now --- scripts/tests/test_helpers.bash | 4 ++-- scripts/tests/test_singularity_cmd.bats | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/tests/test_helpers.bash b/scripts/tests/test_helpers.bash index 4def6e13..a53f2768 100644 --- a/scripts/tests/test_helpers.bash +++ b/scripts/tests/test_helpers.bash @@ -62,8 +62,8 @@ pull_singularity_shim () { fi } -skip_if_travis_osx() { - if [ "$TRAVIS_OS_NAME" = osx ] +skip_if_ci_osx() { + if [ "$TRAVIS_OS_NAME" = osx ] || ( [ -n "GITHUB_ENV" ] && [ "$RUNNER_OS" = "macOS" ] ) then skip "$@" fi diff --git a/scripts/tests/test_singularity_cmd.bats b/scripts/tests/test_singularity_cmd.bats index 96aa1443..e0b44c20 100755 --- a/scripts/tests/test_singularity_cmd.bats +++ b/scripts/tests/test_singularity_cmd.bats @@ -46,26 +46,26 @@ git annex get "$arg_test_img" # bats test_tags=docker @test "verifying ability to singularity exec under /tmp subdir" { - skip_if_travis_osx "skipping Singularity directory test on Travis OSX" + skip_if_ci_osx "skipping Singularity directory test on Travis OSX" check_subdir "$(_mktemp_dir_under /tmp)" } # bats test_tags=docker @test "verifying ability to singularity exec under /tmp subdir (explicit use of docker)" { - skip_if_travis_osx "skipping Singularity directory test on Travis OSX" + skip_if_ci_osx "skipping Singularity directory test on Travis OSX" export REPRONIM_USE_DOCKER=1 check_subdir "$(_mktemp_dir_under /tmp)" } # bats test_tags=docker @test "verifying ability to singularity exec under $HOME subdir" { - skip_if_travis_osx "skipping Singularity directory test on Travis OSX" + skip_if_ci_osx "skipping Singularity directory test on Travis OSX" check_subdir "$(_mktemp_dir_under $HOME)" } # bats test_tags=docker @test "verifying ability to singularity exec under $HOME subdir (explicit use of docker)" { - skip_if_travis_osx "skipping Singularity directory test on Travis OSX" + skip_if_ci_osx "skipping Singularity directory test on Travis OSX" export REPRONIM_USE_DOCKER=1 check_subdir "$(_mktemp_dir_under $HOME)" }