diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 26d2c307..4bf733db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,15 +89,9 @@ jobs: cat ${{ github.workspace }}/setup.sql | cockroach sql --insecure - name: Test run: AR_LOG=summary bundle exec rake test TESTOPTS='--profile=5 --verbose' - - name: Upload queries file - uses: actions/upload-artifact@v3 + - name: Upload test information + uses: actions/upload-artifact@v4 if: always() with: - name: query_time.json - path: tmp/query_time.json - - name: Upload stackprof dump - uses: actions/upload-artifact@v3 - if: always() - with: - name: stackprof.dump - path: tmp/stackprof.dump + name: crdb-${{ matrix.crdb }}_ruby-${{ matrix.ruby }})_test_information + path: tmp/* diff --git a/bin/start-cockroachdb b/bin/start-cockroachdb index a4268c37..1b8063bf 100755 --- a/bin/start-cockroachdb +++ b/bin/start-cockroachdb @@ -6,7 +6,7 @@ die() { echo "$0: $*" 1>&2 ; false; } root_dir="$(dirname $(dirname "$0:A"))" pid_file="$root_dir/tmp/cockroach.pid" -log_file="$root_dir/tmp/cockroachdb.log" +log_file="$root_dir/tmp/cockroach.log" mkdir -p "$root_dir/tmp" [[ -f "$pid_file" ]] && kill -9 $(cat "$pid_file") || true diff --git a/test/cases/helper_cockroachdb.rb b/test/cases/helper_cockroachdb.rb index 7da01e61..56ff16e4 100644 --- a/test/cases/helper_cockroachdb.rb +++ b/test/cases/helper_cockroachdb.rb @@ -224,5 +224,6 @@ class BaseCompatibilityTest < ActiveRecord::TestCase end require "stackprof" -StackProf.start(mode: :wall, interval: 1000) +FileUtils.mkdir_p("tmp") +StackProf.start(mode: :wall, interval: 1000, out: "tmp/stackprof.dump") Minitest.after_run { StackProf.stop; StackProf.results("tmp/stackprof.dump") } diff --git a/test/support/sql_logger.rb b/test/support/sql_logger.rb index e548e05e..d33bda49 100644 --- a/test/support/sql_logger.rb +++ b/test/support/sql_logger.rb @@ -21,9 +21,9 @@ def summary_log time = detail.values.sum { |(total, _, _)| total } / 1_000 count = detail.values.sum { |(_, _, count)| count } puts "Total time spent in SQL: #{time}s (#{count} queries)" - puts "Detail per query kind available in tmp/query_time.json (total time in ms, avg time in ms, query count). Sorted by avg time." + puts "Detail per query kind available in #{Dir.pwd}/tmp/query_time.json (total time in ms, avg time in ms, query count). Sorted by avg time." File.write( - "tmp/query_time.json", + Dir.pwd + "/tmp/query_time.json", JSON.pretty_generate(detail) ) }