From 616064ddfc4e70afb08ab27d08c7c55175750690 Mon Sep 17 00:00:00 2001 From: Rob Ashton Date: Tue, 3 Dec 2024 15:50:59 +0000 Subject: [PATCH 1/5] Pin naomi branch for testing --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 36c08444..c12b9a5f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -54,6 +54,6 @@ Suggests: tidyselect, withr Remotes: - mrc-ide/naomi + mrc-ide/naomi@nm-99 Config/testthat/edition: 3 Config/testthat/parallel: true From 1d8fb519981d8a115011fd4d9732cdb0b3228353 Mon Sep 17 00:00:00 2001 From: Rob Ashton Date: Tue, 3 Dec 2024 16:20:46 +0000 Subject: [PATCH 2/5] Fix test failure --- tests/testthat/test-time-series.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testthat/test-time-series.R b/tests/testthat/test-time-series.R index 21d3b38e..c8875282 100644 --- a/tests/testthat/test-time-series.R +++ b/tests/testthat/test-time-series.R @@ -83,7 +83,7 @@ test_that("get_anc_time_series returns data and columns", { expect_equal(columns[[1]]$id, scalar("plot_type")) expect_equal(columns[[1]]$column_id, scalar("plot")) expect_equal(columns[[1]]$label, scalar("Plot type")) - expect_length(columns[[1]]$values, 9) + expect_length(columns[[1]]$values, 13) expect_setequal( names(columns[[1]]$values[[1]]), c("id", "label", "description", "format", "accuracy") From 340187368725d2d9e764229db23f1f576a928eaf Mon Sep 17 00:00:00 2001 From: Rob Ashton Date: Tue, 3 Dec 2024 20:19:41 +0000 Subject: [PATCH 3/5] Pin version number --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index c12b9a5f..3d530cf7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -24,7 +24,7 @@ Imports: glue, ids, jsonlite (>= 1.2.2), - naomi (>= 2.10.1), + naomi (>= 2.10.3), naomi.options (>= 1.1.0), porcelain (>= 0.1.8), qs, From 0e384fa3631aeb574e832254465c6cfb6945bf19 Mon Sep 17 00:00:00 2001 From: Rob Ashton Date: Tue, 3 Dec 2024 20:37:15 +0000 Subject: [PATCH 4/5] Pin docker build branch too --- .github/workflows/docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index f0aa88b6..d11dc64b 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -55,7 +55,7 @@ jobs: uses: actions/checkout@v4 with: repository: mrc-ide/naomi - ## ref: feature-branch + ref: nm-99 ## ${{ github.token }} is scoped to the current repository, so we ## need to provide our own PAT token: ${{ secrets.NAOMI_GH_PAT }} From 2f6118b8d24834c1614a5ee6a6c23bdf57390143 Mon Sep 17 00:00:00 2001 From: Rob Ashton Date: Wed, 4 Dec 2024 09:29:05 +0000 Subject: [PATCH 5/5] Remove branch pin --- .github/workflows/docker.yaml | 2 +- DESCRIPTION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index d11dc64b..f0aa88b6 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -55,7 +55,7 @@ jobs: uses: actions/checkout@v4 with: repository: mrc-ide/naomi - ref: nm-99 + ## ref: feature-branch ## ${{ github.token }} is scoped to the current repository, so we ## need to provide our own PAT token: ${{ secrets.NAOMI_GH_PAT }} diff --git a/DESCRIPTION b/DESCRIPTION index 3d530cf7..5caf9bdc 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -54,6 +54,6 @@ Suggests: tidyselect, withr Remotes: - mrc-ide/naomi@nm-99 + mrc-ide/naomi Config/testthat/edition: 3 Config/testthat/parallel: true