From f69690494e53db25dd1a1ac4092a0fc9d1005e7b Mon Sep 17 00:00:00 2001
From: Henrik Bengtsson <henrik.bengtsson@gmail.com>
Date: Mon, 4 Mar 2024 18:08:42 -0800
Subject: [PATCH] GA: Test with _R_COMPARE_LANG_OBJECTS=eqonly (sic!)

---
 .github/workflows/R-CMD-check.yaml |  6 ++++--
 R/globalsByName.R                  |  2 +-
 README.md                          |  2 +-
 pkgdown/_pkgdown.yml               | 12 ++++++++----
 pkgdown/_pkgdown.yml.rsp           |  8 ++++----
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
index 3d688bf..e298a2a 100644
--- a/.github/workflows/R-CMD-check.yaml
+++ b/.github/workflows/R-CMD-check.yaml
@@ -42,9 +42,11 @@ jobs:
       _R_CHECK_LENGTH_1_LOGIC2_: true
       _R_CHECK_MATRIX_DATA_: true
       _R_CHECK_SUGGESTS_ONLY_: true
+      ## R (>= 4.4.0) Note, no trailing underscore (sic!)
+      _R_COMPARE_LANG_OBJECTS: eqonly
       
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -99,7 +101,7 @@ jobs:
 
       - name: Upload check results
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ runner.os }}-r${{ matrix.config.r }}-results
           path: check
diff --git a/R/globalsByName.R b/R/globalsByName.R
index fada709..2cf9038 100644
--- a/R/globalsByName.R
+++ b/R/globalsByName.R
@@ -75,7 +75,7 @@ globalsByName <- function(names, envir = parent.frame(), mustExist = TRUE,
   }
 
   if (length(dotdotdots) > 0L) {
-    for (name in dotdotdots) {
+    for (name in c("...", dotdotdots)) {
       where[name] <- list(NULL)
       ddd <- NA
       if (name == "...") {
diff --git a/README.md b/README.md
index 1fd4be0..3a1b616 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 
 
 <div id="badges"><!-- pkgdown markup -->
-<a href="https://CRAN.R-project.org/web/checks/check_results_globals.html"><img border="0" src="https://www.r-pkg.org/badges/version/globals" alt="CRAN check status"/></a> <a href="https://github.com/HenrikBengtsson/globals/actions?query=workflow%3AR-CMD-check"><img border="0" src="https://github.com/HenrikBengtsson/globals/actions/workflows/R-CMD-check.yaml/badge.svg?branch=develop" alt="R CMD check status"/></a>     <a href="https://app.codecov.io/gh/HenrikBengtsson/globals"><img border="0" src="https://codecov.io/gh/HenrikBengtsson/globals/branch/develop/graph/badge.svg" alt="Coverage Status"/></a> 
+<a href="https://CRAN.R-project.org/web/checks/check_results_globals.html"><img border="0" src="https://www.r-pkg.org/badges/version/globals" alt="CRAN check status"/></a> <a href="https://github.com/HenrikBengtsson/globals/actions?query=workflow%3AR-CMD-check"><img border="0" src="https://github.com/HenrikBengtsson/globals/actions/workflows/R-CMD-check.yaml/badge.svg?branch=develop" alt="R CMD check status"/></a>  <a href="https://github.com/HenrikBengtsson/globals/actions?query=workflow%3Afuture_tests"><img border="0" src="https://github.com/HenrikBengtsson/globals/actions/workflows/future_tests.yaml/badge.svg?branch=develop" alt="future.tests checks status"/></a>   <a href="https://app.codecov.io/gh/HenrikBengtsson/globals"><img border="0" src="https://codecov.io/gh/HenrikBengtsson/globals/branch/develop/graph/badge.svg" alt="Coverage Status"/></a> 
 </div>
 
 # globals: Identify Global Objects in R Expressions 
diff --git a/pkgdown/_pkgdown.yml b/pkgdown/_pkgdown.yml
index cbea3c7..d780c76 100644
--- a/pkgdown/_pkgdown.yml
+++ b/pkgdown/_pkgdown.yml
@@ -6,7 +6,7 @@ home:
     href: https://github.com/HenrikBengtsson/globals/milestones
   - text: The Futureverse Project
     href: https://www.futureverse.org/
-  - text: Futureverse User Forum (new!)
+  - text: Futureverse User Forum
     href: https://github.com/HenrikBengtsson/future/discussions
 
 navbar:
@@ -14,13 +14,11 @@ navbar:
     right: [futureverse, pkgs, cran, github]
   components:
     futureverse:
-      icon: fas fa-fast-backward
+      icon: fas fa-home
       href: https://www.futureverse.org/
     pkgs:
       text: Packages
       menu:
-      - text: BiocParallel.FutureParam 
-        href: https://BiocParallel.FutureParam.futureverse.org
       - text: doFuture 
         href: https://doFuture.futureverse.org
       - text: furrr 
@@ -43,6 +41,12 @@ navbar:
         href: https://parallelly.futureverse.org
       - text: progressr 
         href: https://progressr.futureverse.org
+      - text: BiocParallel.FutureParam (experimental)
+        href: https://BiocParallel.FutureParam.futureverse.org
+      - text: future.tools (experimental)
+        href: https://future.tools.futureverse.org
+      - text: future.mirai (experimental)
+        href: https://future.mirai.futureverse.org
       - text: future.mapreduce (experimental)
         href: https://future.mapreduce.futureverse.org
       - text: marshal (experimental)
diff --git a/pkgdown/_pkgdown.yml.rsp b/pkgdown/_pkgdown.yml.rsp
index eaf9d08..6d931ca 100644
--- a/pkgdown/_pkgdown.yml.rsp
+++ b/pkgdown/_pkgdown.yml.rsp
@@ -1,6 +1,6 @@
 <%
-pkgs <- c("globals", "listenv", "parallelly", "future", "future.apply", "furrr", "future.tests", "future.callr", "future.batchtools", "doFuture", "progressr", "BiocParallel.FutureParam")
-pkgs_extra <- c("future.mapreduce", "marshal")
+pkgs <- c("globals", "listenv", "parallelly", "future", "future.apply", "furrr", "future.tests", "future.callr", "future.batchtools", "doFuture", "progressr")
+pkgs_extra <- c("BiocParallel.FutureParam", "future.tools", "future.mirai", "future.mapreduce", "marshal")
 pkgs <- c(sort(pkgs), pkgs_extra)
 urls <- sprintf("https://%s.futureverse.org", pkgs)
 names(urls) <- pkgs
@@ -19,7 +19,7 @@ home:
     href: https://github.com/HenrikBengtsson/<%= pkg %>/milestones
   - text: The Futureverse Project
     href: https://www.futureverse.org/
-  - text: Futureverse User Forum (new!)
+  - text: Futureverse User Forum
     href: https://github.com/HenrikBengtsson/future/discussions
 
 navbar:
@@ -27,7 +27,7 @@ navbar:
     right: [futureverse, pkgs, cran, github]
   components:
     futureverse:
-      icon: fas fa-fast-backward
+      icon: fas fa-home
       href: https://www.futureverse.org/
     pkgs:
       text: Packages