diff --git a/.github/workflows/release_cli_and_assets.yml b/.github/workflows/release_cli_and_assets.yml index b609da1b8..4f828222f 100644 --- a/.github/workflows/release_cli_and_assets.yml +++ b/.github/workflows/release_cli_and_assets.yml @@ -394,7 +394,7 @@ jobs: - name: Set PATH run: | - echo "PATH=$PATH:$HOME/build:$GTIHUB_WORKSPACE/tests/acceptance/lib/bats/libexec" >> $GITHUB_ENV + echo "PATH=$PATH:$HOME/build:$GTIHUB_WORKSPACE/tests/acceptance/lib/bats-core/libexec" >> $GITHUB_ENV - name: Go install jd run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9ae3bcde3..604d4912b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -161,7 +161,7 @@ jobs: - name: Set PATH run: | - echo "PATH=$PATH:$HOME/build:$GTIHUB_WORKSPACE/tests/acceptance/lib/bats/libexec" >> $GITHUB_ENV + echo "PATH=$PATH:$HOME/build:$GTIHUB_WORKSPACE/tests/acceptance/lib/bats-core/libexec" >> $GITHUB_ENV - name: Go install jd run: | diff --git a/.gitmodules b/.gitmodules index 67471a529..3e469711d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ -[submodule "tests/acceptance/lib/bats"] - path = tests/acceptance/lib/bats - url = https://github.com/sstephenson/bats -[submodule "tests/acceptance/lib/bats-assert"] +[submodule "bats-core"] + path = tests/acceptance/lib/bats-core + url = https://github.com/bats-core/bats-core +[submodule "bats-assert"] path = tests/acceptance/lib/bats-assert - url = https://github.com/ztombol/bats-assert -[submodule "tests/acceptance/lib/bats-support"] + url = https://github.com/bats-core/bats-assert +[submodule "bats-support"] path = tests/acceptance/lib/bats-support - url = https://github.com/ztombol/bats-support + url = https://github.com/bats-core/bats-support diff --git a/tests/acceptance/lib/bats b/tests/acceptance/lib/bats deleted file mode 160000 index 03608115d..000000000 --- a/tests/acceptance/lib/bats +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 03608115df2071fff4eaaff1605768c275e5f81f diff --git a/tests/acceptance/lib/bats-assert b/tests/acceptance/lib/bats-assert index 9f88b4207..44913ffe6 160000 --- a/tests/acceptance/lib/bats-assert +++ b/tests/acceptance/lib/bats-assert @@ -1 +1 @@ -Subproject commit 9f88b4207da750093baabc4e3f41bf68f0dd3630 +Subproject commit 44913ffe6020d1561c4c4d1e26cda8e07a1f374f diff --git a/tests/acceptance/lib/bats-core b/tests/acceptance/lib/bats-core new file mode 160000 index 000000000..4417a96cf --- /dev/null +++ b/tests/acceptance/lib/bats-core @@ -0,0 +1 @@ +Subproject commit 4417a96cfc5e4afc493df94eeef8af4eec760163 diff --git a/tests/acceptance/lib/bats-support b/tests/acceptance/lib/bats-support index 004e70763..3c8fadc50 160000 --- a/tests/acceptance/lib/bats-support +++ b/tests/acceptance/lib/bats-support @@ -1 +1 @@ -Subproject commit 004e707638eedd62e0481e8cdc9223ad471f12ee +Subproject commit 3c8fadc5097c9acfc96d836dced2bb598e48b009 diff --git a/tests/acceptance/run.sh b/tests/acceptance/run.sh index f89126787..be900134d 100755 --- a/tests/acceptance/run.sh +++ b/tests/acceptance/run.sh @@ -12,7 +12,7 @@ then fi # set this to the source file for development -export BATS_PATH=$MY_PATH/lib/bats/bin/bats +export BATS_PATH=$MY_PATH/lib/bats-core/bin/bats export LIB_BATS_ASSERT=$MY_PATH/lib/bats-assert export LIB_BATS_SUPPORT=$MY_PATH/lib/bats-support export TEST_DATA_DIR=$MY_PATH/test_data/templates @@ -53,13 +53,15 @@ echo " ___) | || (_| | | | |_| | | | | (_| | | | __/\__ \ |_\__ \\" echo "|____/ \__\__,_|_| \__|_|_| |_|\__, | |_|\___||___/\__|___/" echo " |___/ " -export PATH=$MY_PATH/lib/bats/bin:$PATH +export PATH=$MY_PATH/lib/bats-core/bin:$PATH if [[ ! ${STEAMPIPE_INSTALL_DIR} ]]; then export STEAMPIPE_INSTALL_DIR="$HOME/.steampipe" fi +batversion=$(bats --version) +echo $batversion echo "Running with STEAMPIPE_INSTALL_DIR set to $STEAMPIPE_INSTALL_DIR" if [ $# -eq 0 ]; then