From 4a8cccfc2a2bd81474ac35dbea843f75af772132 Mon Sep 17 00:00:00 2001 From: Greg Lin Date: Thu, 29 Feb 2024 17:08:11 -0600 Subject: [PATCH 1/2] Update for R 4.3.3 --- 4.3/bookworm/Dockerfile | 2 +- 4.3/bookworm/hooks/post_push | 2 +- 4.3/bullseye/Dockerfile | 2 +- 4.3/bullseye/hooks/post_push | 2 +- 4.3/centos7/Dockerfile | 2 +- 4.3/centos7/hooks/post_push | 2 +- 4.3/focal/Dockerfile | 2 +- 4.3/focal/hooks/post_push | 2 +- 4.3/jammy/Dockerfile | 2 +- 4.3/jammy/hooks/post_push | 2 +- 4.3/opensuse154/Dockerfile | 2 +- 4.3/opensuse154/hooks/post_push | 2 +- 4.3/opensuse155/Dockerfile | 2 +- 4.3/opensuse155/hooks/post_push | 2 +- 4.3/rockylinux8/Dockerfile | 2 +- 4.3/rockylinux8/hooks/post_push | 2 +- 4.3/rockylinux9/Dockerfile | 2 +- 4.3/rockylinux9/hooks/post_push | 2 +- Makefile | 4 +++- update.sh | 2 +- 20 files changed, 22 insertions(+), 20 deletions(-) diff --git a/4.3/bookworm/Dockerfile b/4.3/bookworm/Dockerfile index 7b15a56..609c3fb 100644 --- a/4.3/bookworm/Dockerfile +++ b/4.3/bookworm/Dockerfile @@ -7,7 +7,7 @@ ARG BASE_IMAGE=rstudio/r-base FROM ${BASE_IMAGE}:bookworm -ARG R_VERSION=4.3.2 +ARG R_VERSION=4.3.3 ARG OS_IDENTIFIER=debian-12 # Install R diff --git a/4.3/bookworm/hooks/post_push b/4.3/bookworm/hooks/post_push index e1f7978..95a44b0 100644 --- a/4.3/bookworm/hooks/post_push +++ b/4.3/bookworm/hooks/post_push @@ -5,4 +5,4 @@ function add_tag() { docker push $DOCKER_REPO:$1 } -add_tag 4.3.2-bookworm +add_tag 4.3.3-bookworm diff --git a/4.3/bullseye/Dockerfile b/4.3/bullseye/Dockerfile index f0af5f0..873c91b 100644 --- a/4.3/bullseye/Dockerfile +++ b/4.3/bullseye/Dockerfile @@ -7,7 +7,7 @@ ARG BASE_IMAGE=rstudio/r-base FROM ${BASE_IMAGE}:bullseye -ARG R_VERSION=4.3.2 +ARG R_VERSION=4.3.3 ARG OS_IDENTIFIER=debian-11 # Install R diff --git a/4.3/bullseye/hooks/post_push b/4.3/bullseye/hooks/post_push index b520b38..b0ae2a2 100644 --- a/4.3/bullseye/hooks/post_push +++ b/4.3/bullseye/hooks/post_push @@ -5,4 +5,4 @@ function add_tag() { docker push $DOCKER_REPO:$1 } -add_tag 4.3.2-bullseye +add_tag 4.3.3-bullseye diff --git a/4.3/centos7/Dockerfile b/4.3/centos7/Dockerfile index 4105abb..606c30e 100644 --- a/4.3/centos7/Dockerfile +++ b/4.3/centos7/Dockerfile @@ -7,7 +7,7 @@ ARG BASE_IMAGE=rstudio/r-base FROM ${BASE_IMAGE}:centos7 -ARG R_VERSION=4.3.2 +ARG R_VERSION=4.3.3 ARG OS_IDENTIFIER=centos-7 # Install R diff --git a/4.3/centos7/hooks/post_push b/4.3/centos7/hooks/post_push index 75f36c9..e3f55a3 100644 --- a/4.3/centos7/hooks/post_push +++ b/4.3/centos7/hooks/post_push @@ -5,4 +5,4 @@ function add_tag() { docker push $DOCKER_REPO:$1 } -add_tag 4.3.2-centos7 +add_tag 4.3.3-centos7 diff --git a/4.3/focal/Dockerfile b/4.3/focal/Dockerfile index 52196c9..1d624d1 100644 --- a/4.3/focal/Dockerfile +++ b/4.3/focal/Dockerfile @@ -7,7 +7,7 @@ ARG BASE_IMAGE=rstudio/r-base FROM ${BASE_IMAGE}:focal -ARG R_VERSION=4.3.2 +ARG R_VERSION=4.3.3 ARG OS_IDENTIFIER=ubuntu-2004 # Install R diff --git a/4.3/focal/hooks/post_push b/4.3/focal/hooks/post_push index 3540ad0..1465468 100644 --- a/4.3/focal/hooks/post_push +++ b/4.3/focal/hooks/post_push @@ -5,4 +5,4 @@ function add_tag() { docker push $DOCKER_REPO:$1 } -add_tag 4.3.2-focal +add_tag 4.3.3-focal diff --git a/4.3/jammy/Dockerfile b/4.3/jammy/Dockerfile index 686f2fa..de09078 100644 --- a/4.3/jammy/Dockerfile +++ b/4.3/jammy/Dockerfile @@ -7,7 +7,7 @@ ARG BASE_IMAGE=rstudio/r-base FROM ${BASE_IMAGE}:jammy -ARG R_VERSION=4.3.2 +ARG R_VERSION=4.3.3 ARG OS_IDENTIFIER=ubuntu-2204 # Install R diff --git a/4.3/jammy/hooks/post_push b/4.3/jammy/hooks/post_push index 724c52b..76a4b0f 100644 --- a/4.3/jammy/hooks/post_push +++ b/4.3/jammy/hooks/post_push @@ -5,4 +5,4 @@ function add_tag() { docker push $DOCKER_REPO:$1 } -add_tag 4.3.2-jammy +add_tag 4.3.3-jammy diff --git a/4.3/opensuse154/Dockerfile b/4.3/opensuse154/Dockerfile index abf7815..dd16208 100644 --- a/4.3/opensuse154/Dockerfile +++ b/4.3/opensuse154/Dockerfile @@ -7,7 +7,7 @@ ARG BASE_IMAGE=rstudio/r-base FROM ${BASE_IMAGE}:opensuse154 -ARG R_VERSION=4.3.2 +ARG R_VERSION=4.3.3 ARG OS_IDENTIFIER=opensuse-154 # Install R diff --git a/4.3/opensuse154/hooks/post_push b/4.3/opensuse154/hooks/post_push index c542820..80a3a65 100644 --- a/4.3/opensuse154/hooks/post_push +++ b/4.3/opensuse154/hooks/post_push @@ -5,4 +5,4 @@ function add_tag() { docker push $DOCKER_REPO:$1 } -add_tag 4.3.2-opensuse154 +add_tag 4.3.3-opensuse154 diff --git a/4.3/opensuse155/Dockerfile b/4.3/opensuse155/Dockerfile index 4c44648..a45640e 100644 --- a/4.3/opensuse155/Dockerfile +++ b/4.3/opensuse155/Dockerfile @@ -7,7 +7,7 @@ ARG BASE_IMAGE=rstudio/r-base FROM ${BASE_IMAGE}:opensuse155 -ARG R_VERSION=4.3.2 +ARG R_VERSION=4.3.3 ARG OS_IDENTIFIER=opensuse-155 # Install R diff --git a/4.3/opensuse155/hooks/post_push b/4.3/opensuse155/hooks/post_push index de4cd4f..411113c 100644 --- a/4.3/opensuse155/hooks/post_push +++ b/4.3/opensuse155/hooks/post_push @@ -5,4 +5,4 @@ function add_tag() { docker push $DOCKER_REPO:$1 } -add_tag 4.3.2-opensuse155 +add_tag 4.3.3-opensuse155 diff --git a/4.3/rockylinux8/Dockerfile b/4.3/rockylinux8/Dockerfile index 6fa3487..75276eb 100644 --- a/4.3/rockylinux8/Dockerfile +++ b/4.3/rockylinux8/Dockerfile @@ -7,7 +7,7 @@ ARG BASE_IMAGE=rstudio/r-base FROM ${BASE_IMAGE}:rockylinux8 -ARG R_VERSION=4.3.2 +ARG R_VERSION=4.3.3 ARG OS_IDENTIFIER=centos-8 # Install R diff --git a/4.3/rockylinux8/hooks/post_push b/4.3/rockylinux8/hooks/post_push index 284382d..4075bb8 100644 --- a/4.3/rockylinux8/hooks/post_push +++ b/4.3/rockylinux8/hooks/post_push @@ -5,4 +5,4 @@ function add_tag() { docker push $DOCKER_REPO:$1 } -add_tag 4.3.2-rockylinux8 +add_tag 4.3.3-rockylinux8 diff --git a/4.3/rockylinux9/Dockerfile b/4.3/rockylinux9/Dockerfile index c9a4211..41246ed 100644 --- a/4.3/rockylinux9/Dockerfile +++ b/4.3/rockylinux9/Dockerfile @@ -7,7 +7,7 @@ ARG BASE_IMAGE=rstudio/r-base FROM ${BASE_IMAGE}:rockylinux9 -ARG R_VERSION=4.3.2 +ARG R_VERSION=4.3.3 ARG OS_IDENTIFIER=rhel-9 # Install R diff --git a/4.3/rockylinux9/hooks/post_push b/4.3/rockylinux9/hooks/post_push index b901a68..cb8129a 100644 --- a/4.3/rockylinux9/hooks/post_push +++ b/4.3/rockylinux9/hooks/post_push @@ -5,4 +5,4 @@ function add_tag() { docker push $DOCKER_REPO:$1 } -add_tag 4.3.2-rockylinux9 +add_tag 4.3.3-rockylinux9 diff --git a/Makefile b/Makefile index e841dfa..b9c1f74 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,9 @@ VARIANTS ?= focal jammy bullseye bookworm centos7 rockylinux8 rockylinux9 opensu PATCH_VERSIONS ?= 3.1.3 3.2.5 3.3.3 3.4.4 3.5.3 \ 3.6.0 3.6.1 3.6.2 3.6.3 \ 4.0.0 4.0.1 4.0.2 4.0.3 4.0.4 4.0.5 \ - 4.1.0 4.1.1 4.1.2 4.1.3 4.2.0 4.2.1 4.2.2 4.2.3 4.3.0 4.3.1 4.3.2 + 4.1.0 4.1.1 4.1.2 4.1.3 \ + 4.2.0 4.2.1 4.2.2 4.2.3 \ + 4.3.0 4.3.1 4.3.2 4.3.3 # INCLUDE_PATCH_VERSIONS, if set to `yes`, includes all patch versions in the # "all" targets. INCLUDE_PATCH_VERSIONS ?= no diff --git a/update.sh b/update.sh index 5486add..1ba4539 100755 --- a/update.sh +++ b/update.sh @@ -11,7 +11,7 @@ declare -A r_versions=( [4.0]='4.0.5' [4.1]='4.1.3' [4.2]='4.2.3' - [4.3]='4.3.2' + [4.3]='4.3.3' [devel]='devel' ) From b7279204f296d3afa90f03dee75c793372e8982e Mon Sep 17 00:00:00 2001 From: Greg Lin Date: Thu, 29 Feb 2024 17:37:38 -0600 Subject: [PATCH 2/2] Update tests for R 4.4.0 changes to deprecated graphics devices --- test/test.R | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/test.R b/test/test.R index 89c92ef..9f8a6ca 100644 --- a/test/test.R +++ b/test/test.R @@ -46,8 +46,10 @@ tryCatch(capabilities(), warning = function(w) { # Check graphics devices # https://stat.ethz.ch/R-manual/R-devel/library/grDevices/html/Devices.html -for (dev_name in c("png", "jpeg", "tiff", "svg", "bmp", "pdf", "postscript", - "xfig", "pictex", "cairo_pdf", "cairo_ps")) { +devices <- c("png", "jpeg", "tiff", "svg", "bmp", "pdf", "postscript", + if (getRversion() < "4.4.0") c("xfig", "pictex"), + "cairo_pdf", "cairo_ps") +for (dev_name in devices) { # Skip unsupported graphics devices (e.g. tiff in R >= 3.3 on CentOS 6) if (dev_name %in% names(capabilities()) && capabilities(dev_name) == FALSE) { next