From 27e98fd53651751e72107b26ee058ba755faed89 Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Tue, 31 Oct 2023 13:38:37 -0400 Subject: [PATCH 1/4] Build docker images for jammy, drop bionic --- .github/workflows/apps-docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/apps-docker.yml b/.github/workflows/apps-docker.yml index eba87dae63..0fab9283af 100644 --- a/.github/workflows/apps-docker.yml +++ b/.github/workflows/apps-docker.yml @@ -44,9 +44,9 @@ jobs: # - workdir: inst/Docker/centos # type: centos7 - workdir: inst/Docker/ubuntu - type: focal + type: jammy - workdir: inst/Docker/ubuntu - type: bionic + type: focal steps: - name: Short R version and SHA From 43c6a204b8dc3f66037e79457ca0ac3407e34c3e Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Tue, 31 Oct 2023 13:40:31 -0400 Subject: [PATCH 2/4] chore(docker): Drop bionic, support jammy --- R/docker.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/docker.R b/R/docker.R index 66ae06367e..73acde3f62 100644 --- a/R/docker.R +++ b/R/docker.R @@ -23,7 +23,7 @@ docker_clean <- function(stopped_containers = TRUE, untagged_images = TRUE) { docker_run_server <- function( type = c("sso", "ssp"), - release = c("focal", "bionic", "centos7"), + release = c("jammy", "focal", "centos7"), license_file = NULL, port = switch(type, sso = switch(release, "centos7" = 7878, 3838), From 65e272303e19b272227a2b5840e5a7cda38c690d Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Tue, 31 Oct 2023 13:42:19 -0400 Subject: [PATCH 3/4] chore(test-in-sso): Update release values --- R/test-in-sso.R | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/R/test-in-sso.R b/R/test-in-sso.R index aa1ac06244..cd9a4ca28d 100644 --- a/R/test-in-sso.R +++ b/R/test-in-sso.R @@ -31,7 +31,7 @@ test_in_sso <- function( apps = apps_manual, ..., user = github_user(), - release = c("focal", "bionic", "centos7"), + release = c("jammy", "focal", "centos7"), r_version = c("4.3", "4.2", "4.1", "4.0", "3.6"), tag = NULL, port = 8080, @@ -62,7 +62,7 @@ test_in_ssp <- function( ..., license_file = NULL, user = github_user(), - release = c("focal", "bionic", "centos7"), + release = c("jammy", "focal", "centos7"), r_version = c("4.3", "4.2", "4.1", "4.0", "3.6"), tag = NULL, port = 8080, @@ -94,7 +94,7 @@ test_in_ssossp <- function( app_name = apps[1], apps = apps_manual, type = c("sso", "ssp"), - release = c("focal", "bionic", "centos7"), + release = c("jammy", "focal", "centos7"), license_file = NULL, port_background = switch(type, sso = switch(release, "centos7" = 7878, 3838), From 449a98cbe9b688b34466800bd9b6ed4eb14defba Mon Sep 17 00:00:00 2001 From: gadenbuie Date: Tue, 31 Oct 2023 17:59:31 +0000 Subject: [PATCH 4/4] `devtools::document()` (GitHub Actions) --- man/test_in_ssossp.Rd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/man/test_in_ssossp.Rd b/man/test_in_ssossp.Rd index 88eaef640d..4acb29a9f2 100644 --- a/man/test_in_ssossp.Rd +++ b/man/test_in_ssossp.Rd @@ -10,7 +10,7 @@ test_in_sso( apps = apps_manual, ..., user = github_user(), - release = c("focal", "bionic", "centos7"), + release = c("jammy", "focal", "centos7"), r_version = c("4.3", "4.2", "4.1", "4.0", "3.6"), tag = NULL, port = 8080, @@ -24,7 +24,7 @@ test_in_ssp( ..., license_file = NULL, user = github_user(), - release = c("focal", "bionic", "centos7"), + release = c("jammy", "focal", "centos7"), r_version = c("4.3", "4.2", "4.1", "4.0", "3.6"), tag = NULL, port = 8080,