From 297f13bbdf34427c43f1618e008a5bf9fe6d18f9 Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Thu, 20 Jun 2024 11:57:33 +0200 Subject: [PATCH 01/10] Update --- action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 3003368..0c5897e 100644 --- a/action.yml +++ b/action.yml @@ -75,8 +75,9 @@ runs: https://api.github.com/repos/quarto-dev/quarto-cli/releases?per_page=100 \ 2>/dev/null | \ jq -r 'map(select(.tag_name | test("^v1.[5-9]"))) | .[0].name[1:]')" + export QUARTO_VERSION="1.5.37" echo "Downloading and installing latest Quarto CLI version ${QUARTO_VERSION}" - wget https://github.com/quarto-dev/quarto-cli/releases/download/v${QUARTO_VERSION}/quarto-${QUARTO_VERSION}-linux-amd64.deb + wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v${QUARTO_VERSION}/quarto-${QUARTO_VERSION}-linux-amd64.deb dpkg -i quarto-${QUARTO_VERSION}-linux-amd64.deb echo "New Quarto CLI version: $(quarto --version)" fi From 4aeb45b22814b1702d0c5c36b1042ad81568bc5d Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Thu, 20 Jun 2024 13:59:00 +0200 Subject: [PATCH 02/10] Update --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 0c5897e..3083915 100644 --- a/action.yml +++ b/action.yml @@ -75,7 +75,7 @@ runs: https://api.github.com/repos/quarto-dev/quarto-cli/releases?per_page=100 \ 2>/dev/null | \ jq -r 'map(select(.tag_name | test("^v1.[5-9]"))) | .[0].name[1:]')" - export QUARTO_VERSION="1.5.37" + export QUARTO_VERSION="1.5.29" echo "Downloading and installing latest Quarto CLI version ${QUARTO_VERSION}" wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v${QUARTO_VERSION}/quarto-${QUARTO_VERSION}-linux-amd64.deb dpkg -i quarto-${QUARTO_VERSION}-linux-amd64.deb From 893441f872fa2bd112264b2081c4fac5bea43133 Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Thu, 20 Jun 2024 15:09:24 +0200 Subject: [PATCH 03/10] Update --- action.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/action.yml b/action.yml index 3083915..142e5db 100644 --- a/action.yml +++ b/action.yml @@ -67,16 +67,8 @@ runs: echo "❌ Quarto CLI version insufficient (< ${MIN_QUARTO_VERSION})" apt-get update apt-get install -qy wget jq - # Install newer version of Quarto CLI. - # This gets the latest version number (v1.5 up to v1.9) of Quarto from GitHub releases. - # It assumes that such version number (v1.5 up to v1.9) exists within the last 100 released Quarto versions. - export QUARTO_VERSION="$(curl -L -H "Accept: application/vnd.github+json" \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - https://api.github.com/repos/quarto-dev/quarto-cli/releases?per_page=100 \ - 2>/dev/null | \ - jq -r 'map(select(.tag_name | test("^v1.[5-9]"))) | .[0].name[1:]')" - export QUARTO_VERSION="1.5.29" - echo "Downloading and installing latest Quarto CLI version ${QUARTO_VERSION}" + export QUARTO_VERSION="1.5.37" + echo "Downloading and installing Quarto CLI version ${QUARTO_VERSION}" wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v${QUARTO_VERSION}/quarto-${QUARTO_VERSION}-linux-amd64.deb dpkg -i quarto-${QUARTO_VERSION}-linux-amd64.deb echo "New Quarto CLI version: $(quarto --version)" From 21534129fc35e502bdcfdd508d8fe550ca971830 Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Thu, 20 Jun 2024 15:24:44 +0200 Subject: [PATCH 04/10] Update --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 142e5db..d50c50d 100644 --- a/action.yml +++ b/action.yml @@ -67,7 +67,7 @@ runs: echo "❌ Quarto CLI version insufficient (< ${MIN_QUARTO_VERSION})" apt-get update apt-get install -qy wget jq - export QUARTO_VERSION="1.5.37" + export QUARTO_VERSION="1.5.29" echo "Downloading and installing Quarto CLI version ${QUARTO_VERSION}" wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v${QUARTO_VERSION}/quarto-${QUARTO_VERSION}-linux-amd64.deb dpkg -i quarto-${QUARTO_VERSION}-linux-amd64.deb From 75555af9b2caa0fd78acf171c2332533ab86f9ac Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Mon, 24 Jun 2024 12:11:18 +0200 Subject: [PATCH 05/10] Update --- action.yml | 2 +- report-generator.R | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/action.yml b/action.yml index d50c50d..836f451 100644 --- a/action.yml +++ b/action.yml @@ -67,7 +67,7 @@ runs: echo "❌ Quarto CLI version insufficient (< ${MIN_QUARTO_VERSION})" apt-get update apt-get install -qy wget jq - export QUARTO_VERSION="1.5.29" + export QUARTO_VERSION="1.4.555" echo "Downloading and installing Quarto CLI version ${QUARTO_VERSION}" wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v${QUARTO_VERSION}/quarto-${QUARTO_VERSION}-linux-amd64.deb dpkg -i quarto-${QUARTO_VERSION}-linux-amd64.deb diff --git a/report-generator.R b/report-generator.R index 7a48b92..fdcfd36 100755 --- a/report-generator.R +++ b/report-generator.R @@ -43,4 +43,4 @@ if (!disable_install_dev_deps) { library(quarto) cat(paste0("Running Quarto render for template: ", template_path)) -quarto_render(template_path, output_file = "validation_report.pdf") +quarto_render(template_path, output_file = "validation_report.pdf", debug = TRUE) From 0c433c3845ca5069e80b963822535a857d749e03 Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Mon, 24 Jun 2024 12:22:11 +0200 Subject: [PATCH 06/10] Update --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 836f451..d50c50d 100644 --- a/action.yml +++ b/action.yml @@ -67,7 +67,7 @@ runs: echo "❌ Quarto CLI version insufficient (< ${MIN_QUARTO_VERSION})" apt-get update apt-get install -qy wget jq - export QUARTO_VERSION="1.4.555" + export QUARTO_VERSION="1.5.29" echo "Downloading and installing Quarto CLI version ${QUARTO_VERSION}" wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v${QUARTO_VERSION}/quarto-${QUARTO_VERSION}-linux-amd64.deb dpkg -i quarto-${QUARTO_VERSION}-linux-amd64.deb From 541b67f129d31222fcc826e260b444cd2fc70108 Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Mon, 24 Jun 2024 12:48:21 +0200 Subject: [PATCH 07/10] Update --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index d50c50d..61e6b86 100644 --- a/action.yml +++ b/action.yml @@ -67,7 +67,7 @@ runs: echo "❌ Quarto CLI version insufficient (< ${MIN_QUARTO_VERSION})" apt-get update apt-get install -qy wget jq - export QUARTO_VERSION="1.5.29" + export QUARTO_VERSION="1.5.47" echo "Downloading and installing Quarto CLI version ${QUARTO_VERSION}" wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v${QUARTO_VERSION}/quarto-${QUARTO_VERSION}-linux-amd64.deb dpkg -i quarto-${QUARTO_VERSION}-linux-amd64.deb From 4a85b3cbca7d0fbfac7fe99da9f4b5ba8fbf2902 Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Mon, 24 Jun 2024 14:32:31 +0200 Subject: [PATCH 08/10] Update --- template.qmd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/template.qmd b/template.qmd index 7ed4257..a11efad 100644 --- a/template.qmd +++ b/template.qmd @@ -93,7 +93,7 @@ tt_git_df <- data.frame( tt( tt_git_df, caption = "Git information", - theme = "striped" + theme = "grid" ) ``` @@ -135,7 +135,7 @@ tt_riskmetric_df <- d_riskmetric %>% tt( tt_riskmetric_df, caption = "Package info assessed by the R package riskmetric", - theme = "striped" + theme = "grid" ) ``` @@ -209,7 +209,7 @@ if (require("covtracer", quietly = TRUE)) { tt( tt_covtracer_df, caption = "Tracebility matrix mapping unit tests to documented behaviours.", - theme = "striped" + theme = "grid" ) } else { cat("No test suites.") @@ -238,7 +238,7 @@ if (require("covtracer", quietly = TRUE)) { tt( tt_untested_df, caption = "Untested behaviours: documentation that is not covered by any test.", - theme = "striped" + theme = "grid" ) } } else { @@ -263,7 +263,7 @@ if (require("covtracer", quietly = TRUE)) { tt( tt_granularity_df, caption = "Granularity of unit tests: directly tested exported functions.", - theme = "striped" + theme = "grid" ) } else { cat("{covtracer} not available to produce a traceability matrix") From 81b81577adbd3d7eed7e765f298d743a0f515e41 Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Mon, 24 Jun 2024 14:48:38 +0200 Subject: [PATCH 09/10] Update --- template.qmd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/template.qmd b/template.qmd index a11efad..adfa8b7 100644 --- a/template.qmd +++ b/template.qmd @@ -55,7 +55,7 @@ tt_sys_info_df <- data.frame( tt( tt_sys_info_df, caption = "System information", - theme = "striped" + theme = "bootstrap" ) ``` @@ -93,7 +93,7 @@ tt_git_df <- data.frame( tt( tt_git_df, caption = "Git information", - theme = "grid" + theme = "bootstrap" ) ``` @@ -135,7 +135,7 @@ tt_riskmetric_df <- d_riskmetric %>% tt( tt_riskmetric_df, caption = "Package info assessed by the R package riskmetric", - theme = "grid" + theme = "bootstrap" ) ``` @@ -209,7 +209,7 @@ if (require("covtracer", quietly = TRUE)) { tt( tt_covtracer_df, caption = "Tracebility matrix mapping unit tests to documented behaviours.", - theme = "grid" + theme = "bootstrap" ) } else { cat("No test suites.") @@ -238,7 +238,7 @@ if (require("covtracer", quietly = TRUE)) { tt( tt_untested_df, caption = "Untested behaviours: documentation that is not covered by any test.", - theme = "grid" + theme = "bootstrap" ) } } else { @@ -263,7 +263,7 @@ if (require("covtracer", quietly = TRUE)) { tt( tt_granularity_df, caption = "Granularity of unit tests: directly tested exported functions.", - theme = "grid" + theme = "bootstrap" ) } else { cat("{covtracer} not available to produce a traceability matrix") From 478393c141ea82e092cb6477df28a405bcf496e3 Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Mon, 24 Jun 2024 16:12:32 +0200 Subject: [PATCH 10/10] Update --- action.yml | 13 ++++++++++--- report-generator.R | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/action.yml b/action.yml index 61e6b86..3003368 100644 --- a/action.yml +++ b/action.yml @@ -67,9 +67,16 @@ runs: echo "❌ Quarto CLI version insufficient (< ${MIN_QUARTO_VERSION})" apt-get update apt-get install -qy wget jq - export QUARTO_VERSION="1.5.47" - echo "Downloading and installing Quarto CLI version ${QUARTO_VERSION}" - wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v${QUARTO_VERSION}/quarto-${QUARTO_VERSION}-linux-amd64.deb + # Install newer version of Quarto CLI. + # This gets the latest version number (v1.5 up to v1.9) of Quarto from GitHub releases. + # It assumes that such version number (v1.5 up to v1.9) exists within the last 100 released Quarto versions. + export QUARTO_VERSION="$(curl -L -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + https://api.github.com/repos/quarto-dev/quarto-cli/releases?per_page=100 \ + 2>/dev/null | \ + jq -r 'map(select(.tag_name | test("^v1.[5-9]"))) | .[0].name[1:]')" + echo "Downloading and installing latest Quarto CLI version ${QUARTO_VERSION}" + wget https://github.com/quarto-dev/quarto-cli/releases/download/v${QUARTO_VERSION}/quarto-${QUARTO_VERSION}-linux-amd64.deb dpkg -i quarto-${QUARTO_VERSION}-linux-amd64.deb echo "New Quarto CLI version: $(quarto --version)" fi diff --git a/report-generator.R b/report-generator.R index fdcfd36..7a48b92 100755 --- a/report-generator.R +++ b/report-generator.R @@ -43,4 +43,4 @@ if (!disable_install_dev_deps) { library(quarto) cat(paste0("Running Quarto render for template: ", template_path)) -quarto_render(template_path, output_file = "validation_report.pdf", debug = TRUE) +quarto_render(template_path, output_file = "validation_report.pdf")