From 0334fa80ca33f9ec548f1ea95edbe118af011596 Mon Sep 17 00:00:00 2001 From: Douglas Ezra Morrison Date: Wed, 19 Aug 2026 19:28:53 -0700 Subject: [PATCH 1/4] chore: switch altdoc from recursive-qmd-search branch to main --- .github/workflows/copilot-setup-steps.yml | 4 ++-- .github/workflows/docs.yaml | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml index a8e3e497..4776f58e 100644 --- a/.github/workflows/copilot-setup-steps.yml +++ b/.github/workflows/copilot-setup-steps.yml @@ -85,8 +85,8 @@ jobs: any::lintr any::spelling any::rmarkdown - d-morrison/altdoc@recursive-qmd-search - needs: check + d-morrison/altdoc@main + needs: checkmain # Set up Quarto - required for rendering the website - name: Set up Quarto diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index cad61ccb..a67ffad3 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -82,7 +82,7 @@ jobs: | sort -V \ | tail -n 1 ) - echo "latest_stable_tag=$LATEST_STABLE_TAG" >> "$GITHUB_OUTPUT" + echo "latest_stable_mainAG" >> "$GITHUB_OUTPUT" - name: Validate stable workflow_dispatch input if: github.event_name == 'workflow_dispatch' && github.event.inputs.version == 'stable' @@ -141,8 +141,13 @@ jobs: connect website extra-packages: | +<<<<<<< Updated upstream d-morrison/altdoc@recursive-qmd-search quarto-dev/quarto-r +======= + d-morrison/altdoc@main + quarto-dev/quarto +>>>>>>> Stashed changes any::sessioninfo local::. From 83375957b0ed34ac7f73e3b02bfe45a45fdd548b Mon Sep 17 00:00:00 2001 From: Douglas Ezra Morrison Date: Thu, 20 Aug 2026 00:06:50 -0700 Subject: [PATCH 2/4] chore: update roxygen2 version in DESCRIPTION --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index c21431de..fce2c5a6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -30,4 +30,4 @@ Suggests: Config/testthat/edition: 3 VignetteBuilder: knitr, quarto Config/Needs/website: quarto -Config/roxygen2/version: 8.0.0 +Config/roxygen2/version: 8.1.0 From cb2490bb9df80d5e1274d9bbd811125853a8f4c5 Mon Sep 17 00:00:00 2001 From: Douglas Ezra Morrison Date: Thu, 20 Aug 2026 00:22:28 -0700 Subject: [PATCH 3/4] chore: bump version and add NEWS entry --- DESCRIPTION | 2 +- NEWS.md | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index fce2c5a6..8b147417 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: rpt Title: What the Package Does (One Line, Title Case) -Version: 1.0.2.9002 +Version: 1.0.2.9003 Authors@R: c( person("First", "Last", , "first.last@example.com", role = c("aut", "cre")) ) diff --git a/NEWS.md b/NEWS.md index 876c0c17..1a72ca54 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,8 @@ # rpt (development version) +- Switch altdoc dependency from `d-morrison/altdoc@recursive-qmd-search` + to `d-morrison/altdoc@main` (268 commits ahead, 0 behind). + - Contributing docs now ask for screenshots of the rendered documentation site on pull requests that change it, preferring a link into the PR-preview deployment over a local capture, and repair an unbalanced code fence that From 10bdb99c208ed4891528d46e416a8c0346fe5815 Mon Sep 17 00:00:00 2001 From: Douglas Ezra Morrison Date: Thu, 20 Aug 2026 11:35:43 -0700 Subject: [PATCH 4/4] fix: resolve unmerged conflict markers and corrupted lines in docs workflows Addresses three blocking issues flagged across the PR's review rounds: - docs.yaml: extra-packages block still carried unresolved `<<<<<<< Updated upstream` / `=======` / `>>>>>>> Stashed changes` markers from the altdoc branch switch, with both quarto-dev/quarto-r (correct R package) and quarto-dev/quarto (CLI repo, not installable as an R package) present. Resolved to keep d-morrison/altdoc@main and quarto-dev/quarto-r. - docs.yaml: the latest_stable_tag GITHUB_OUTPUT line was corrupted to `echo "latest_stable_mainAG" >> "$GITHUB_OUTPUT"`, breaking the stable /latest-tag/ deploy logic. Restored to `echo "latest_stable_tag=$LATEST_STABLE_TAG" >> "$GITHUB_OUTPUT"`. - copilot-setup-steps.yml: `needs: checkmain` referenced an unrecognized Config/Needs/* value (DESCRIPTION only defines Config/Needs/website). Restored to `needs: check`. --- .github/workflows/copilot-setup-steps.yml | 2 +- .github/workflows/docs.yaml | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml index 4776f58e..622446c6 100644 --- a/.github/workflows/copilot-setup-steps.yml +++ b/.github/workflows/copilot-setup-steps.yml @@ -86,7 +86,7 @@ jobs: any::spelling any::rmarkdown d-morrison/altdoc@main - needs: checkmain + needs: check # Set up Quarto - required for rendering the website - name: Set up Quarto diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index a67ffad3..04c1e2df 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -82,7 +82,7 @@ jobs: | sort -V \ | tail -n 1 ) - echo "latest_stable_mainAG" >> "$GITHUB_OUTPUT" + echo "latest_stable_tag=$LATEST_STABLE_TAG" >> "$GITHUB_OUTPUT" - name: Validate stable workflow_dispatch input if: github.event_name == 'workflow_dispatch' && github.event.inputs.version == 'stable' @@ -141,13 +141,8 @@ jobs: connect website extra-packages: | -<<<<<<< Updated upstream - d-morrison/altdoc@recursive-qmd-search - quarto-dev/quarto-r -======= d-morrison/altdoc@main - quarto-dev/quarto ->>>>>>> Stashed changes + quarto-dev/quarto-r any::sessioninfo local::.