From 59321c1ef68234cfbcb682884df1377dbc4d6e1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Por=C4=99bski?= Date: Mon, 8 Jan 2024 13:33:46 +0100 Subject: [PATCH] Tests properly running on CircleCI --- .circleci/bundle_ruby_3_0.sh | 4 ---- .circleci/bundle_ruby_3_2.sh | 3 --- .circleci/tests_database_ci.sh | 13 ------------- bin/tests_database_ci.sh | 4 ++-- 4 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 .circleci/bundle_ruby_3_0.sh delete mode 100644 .circleci/bundle_ruby_3_2.sh delete mode 100644 .circleci/tests_database_ci.sh diff --git a/.circleci/bundle_ruby_3_0.sh b/.circleci/bundle_ruby_3_0.sh deleted file mode 100644 index 15d0dfcbd4..0000000000 --- a/.circleci/bundle_ruby_3_0.sh +++ /dev/null @@ -1,4 +0,0 @@ -sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B -sudo apt-get update && sudo apt-get install libvips -bundle config --local path vendor/bundle -bundle check || bundle install \ No newline at end of file diff --git a/.circleci/bundle_ruby_3_2.sh b/.circleci/bundle_ruby_3_2.sh deleted file mode 100644 index 2539cdeb07..0000000000 --- a/.circleci/bundle_ruby_3_2.sh +++ /dev/null @@ -1,3 +0,0 @@ -sudo apt-get update && sudo apt-get install libvips42 -bundle config --local path vendor/bundle -bundle check || bundle install \ No newline at end of file diff --git a/.circleci/tests_database_ci.sh b/.circleci/tests_database_ci.sh deleted file mode 100644 index 6432acf2ed..0000000000 --- a/.circleci/tests_database_ci.sh +++ /dev/null @@ -1,13 +0,0 @@ -pwd -cd ../.. -pwd -sudo apt-get update && sudo apt-get install libvips42 -bundle config --local path vendor/bundle -bundle check || bundle install -bundle exec rake test_app -cd spec/dummy && yarn unlink @spree/dashboard -TESTFILES=$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings) - bundle exec rspec --format documentation \ - --format RspecJunitFormatter \ - -o ~/rspec/rspec.xml \ - -- ${TESTFILES} diff --git a/bin/tests_database_ci.sh b/bin/tests_database_ci.sh index 4b43da5e92..e5861ba6ae 100644 --- a/bin/tests_database_ci.sh +++ b/bin/tests_database_ci.sh @@ -2,9 +2,9 @@ sudo apt-get update && sudo apt-get install libvips42 bundle config --local path vendor/bundle bundle check || bundle install bundle exec rake test_app -cd spec/dummy && yarn unlink @spree/dashboard +cd spec/dummy && yarn unlink @spree/dashboard && cd ../.. TESTFILES=$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings) bundle exec rspec --format documentation \ --format RspecJunitFormatter \ -o ~/rspec/rspec.xml \ - -- ${TESTFILES} \ No newline at end of file + -- ${TESTFILES}