diff --git a/.github/workflows/touchstone-receive.yaml b/.github/workflows/touchstone-receive.yaml index 26bf65ea048..7db84fe19c3 100644 --- a/.github/workflows/touchstone-receive.yaml +++ b/.github/workflows/touchstone-receive.yaml @@ -66,10 +66,15 @@ jobs: benchmarking_path: ${{ matrix.config.benchmarking_path }} force_upstream: true r-version: ${{ matrix.config.r }} - # Install the {touchstone} R package from the same commit as the - # action above. The default ('@v1') predates the fix that encodes - # filesystem-unsafe characters in branch names, so head branches with - # a "/" (e.g. feat/foo) get stored as a nested records//feat/foo - # directory; benchmark_analyze() then can't match base+head and - # silently drops every benchmark, producing an empty results table. - touchstone_ref: "@7e6072a25d1f8d72649188bc711113039ef94b75" + # Install the {touchstone} R package from the `table` branch of + # maelle/touchstone (lorenzwalthert/touchstone#173), which formats + # the results as a Markdown table. It builds on the commit pinned for + # the action above, so it also includes the fix that encodes + # filesystem-unsafe characters in branch names. The default ('@v1') + # lacks that fix: head branches with a "/" (e.g. feat/foo) are stored + # as a nested records//feat/foo directory, and + # benchmark_analyze() then can't match base and head, so it silently + # drops every benchmark and the results table comes out empty. + # Switch back to lorenzwalthert/touchstone once #173 is merged. + touchstone_package: "github::maelle/touchstone" + touchstone_ref: "@table" diff --git a/touchstone/script.R b/touchstone/script.R index 915ec29935c..c2689fda0c5 100644 --- a/touchstone/script.R +++ b/touchstone/script.R @@ -158,6 +158,7 @@ benchmark_run( library(igraph) set.seed(42) g <- sample_gnm(1000L, 5000L) + E(g)$weight <- runif(5000L) m <- as_adjacency_matrix(g, weights = "weight") for (i in 1:5) { @@ -487,4 +488,4 @@ benchmark_run( ) # Create the artifacts consumed by the GitHub Action. -benchmark_analyze() +benchmark_analyze(sorting = "current_running_time")