From 3db201394d16ddc72241cd3873be6e5b77e65496 Mon Sep 17 00:00:00 2001
From: Jeff Dickey <216188+jdx@users.noreply.github.com>
Date: Thu, 14 Dec 2023 02:48:03 -0600
Subject: [PATCH] CI: test run formatting

---
 e2e/config/.e2e.rtx.toml |  6 +++---
 e2e/run_test             |  1 -
 justfile                 | 13 +++++++++++--
 scripts/release.sh       |  8 --------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/e2e/config/.e2e.rtx.toml b/e2e/config/.e2e.rtx.toml
index 84239c98b..05bbad59d 100644
--- a/e2e/config/.e2e.rtx.toml
+++ b/e2e/config/.e2e.rtx.toml
@@ -5,10 +5,10 @@ env_path = ["/root", "./cwd"]
 FOO = "bar"
 
 [tools]
-python = "3.12.0"
+bun = "1.0.17"
+deno = "1.38.5"
 tiny = "latest"
-poetry = {version="1.7.1", pyproject="pyproject.toml"}
 #golang = {version="1.19.5", foo="bar"}
 
 [plugins]
-tiny-ref = "https://github.com/rtx-plugins/rtx-tiny#df03b6719dd465d565bb66273942c8495673eaa4"
+tiny-ref = "https://github.com/rtx-plugins/rtx-tiny#c532b140abd4ca00d3e76651b9bd32a980bd483c"
diff --git a/e2e/run_test b/e2e/run_test
index 618ea855f..69d83bb5f 100755
--- a/e2e/run_test
+++ b/e2e/run_test
@@ -39,7 +39,6 @@ run_test() {
 	END=$(date +%s)
 
 	echo "$TEST: $((END - START))s"
-	echo "::endgroup::"
 	if [[ -z "${GITHUB_STEP_SUMMARY:-}" ]]; then
 		return
 	fi
diff --git a/justfile b/justfile
index cd00b47c1..5cca39586 100644
--- a/justfile
+++ b/justfile
@@ -47,27 +47,36 @@ test-e2e TEST=("all"): build
 # run unit tests w/ coverage
 test-coverage:
     #!/usr/bin/env bash
+    echo "::group::Setup"
     set -euxo pipefail
     source <(cargo llvm-cov show-env --export-prefix)
     cargo llvm-cov clean --workspace
-
     if [[ -n "${RTX_GITHUB_BOT_TOKEN:-}" ]]; then
     	export GITHUB_API_TOKEN="$RTX_GITHUB_BOT_TOKEN"
     fi
-
     export CARGO_TARGET_DIR="${CARGO_TARGET_DIR:-$PWD/target}"
     export PATH="${CARGO_TARGET_DIR}/debug:$PATH"
+
+    echo "::group::Unit tests"
     cargo test --all-features
+    echo "::group::Build w/ coverage"
     cargo build --all-features
+    echo "::endgroup::"
     ./e2e/run_all_tests
     if [[ "${TEST_TRANCHE:-}" == 0 ]]; then
+        echo "::group::Trust"
         rtx trust
+        echo "::group::render-help render-completions render-mangen"
         just render-help render-completions render-mangen
+        echo "::group::Implode"
         rtx implode
     elif [[ "${TEST_TRANCHE:-}" == 1 ]]; then
+        echo "::group::Trust"
         rtx trust
+        echo "::group::Self update"
         rtx self-update -fy
     fi
+    echo "::group::Render lcov report"
     cargo llvm-cov report --lcov --output-path lcov.info
 
 # delete built files
diff --git a/scripts/release.sh b/scripts/release.sh
index 79c787a5d..6377f67e5 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -11,7 +11,6 @@ RELEASE_DIR=releases
 export BASE_DIR RTX_VERSION RELEASE_DIR
 rm -rf "${RELEASE_DIR:?}/$RTX_VERSION"
 mkdir -p "$RELEASE_DIR/$RTX_VERSION"
-echo "::endgroup::"
 
 echo "::group::Build"
 find artifacts -name 'tarball-*' -exec sh -c '
@@ -39,7 +38,6 @@ for platform in "${platforms[@]}"; do
   cp -v rtx/bin/rtx "$RELEASE_DIR/rtx-latest-$platform"
   cp -v rtx/bin/rtx "$RELEASE_DIR/$RTX_VERSION/rtx-$RTX_VERSION-$platform"
 done
-echo "::endgroup::"
 
 echo "::group::Checksums"
 pushd "$RELEASE_DIR"
@@ -58,25 +56,20 @@ sha512sum ./* >SHASUMS512.txt
 gpg --clearsign -u 408B88DB29DDE9E0 <SHASUMS256.txt >SHASUMS256.asc
 gpg --clearsign -u 408B88DB29DDE9E0 <SHASUMS512.txt >SHASUMS512.asc
 popd
-echo "::endgroup::"
 
 echo "::group::install.sh"
 ./rtx/scripts/render-install.sh >"$RELEASE_DIR"/install.sh
 chmod +x "$RELEASE_DIR"/install.sh
 shellcheck "$RELEASE_DIR"/install.sh
 gpg -u 408B88DB29DDE9E0 --output "$RELEASE_DIR"/install.sh.sig --sign "$RELEASE_DIR"/install.sh
-echo "::endgroup::"
 
 if [[ "$DRY_RUN" != 1 ]]; then
   echo "::group::Publish npm @jdxcode/rtx"
   NPM_PREFIX=@jdxcode/rtx ./rtx/scripts/release-npm.sh
-  echo "::endgroup::"
   echo "::group::Publish npm rtx-cli"
   NPM_PREFIX=rtx-cli ./rtx/scripts/release-npm.sh
-  echo "::endgroup::"
   echo "::group::Publish r2"
   ./rtx/scripts/publish-r2.sh
-  echo "::endgroup::"
 fi
 
 echo "::group::Publish homebrew"
@@ -84,4 +77,3 @@ echo "::group::Publish homebrew"
 pushd homebrew-tap
 git add . && git commit -m "rtx ${RTX_VERSION#v}"
 popd
-echo "::endgroup::"