PPM SSO

.Rbuildignore

@@ -44,6 +44,8 @@
 ^src/library/curl/tools/option_table[.]txt$
 ^src/library/jsonlite/src/yajl/libstatyajl[.]a$
 ^src/library/pkgdepends/man/macros/eval2[.]Rd$
+^src/library/ts/man/macros/eval2[.]Rd$
+^src/library/tstoml/man/macros/eval2[.]Rd$
 ^src/library/processx/src/supervisor/supervisor$
 ^src/library/processx/src/tools/px$
 ^src/library/processx/src/tools/sock$

.github/workflows/R-CMD-check.yaml

@@ -42,7 +42,7 @@ jobs:
       R_KEEP_PKG_SOURCE: yes
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - uses: r-lib/actions/setup-pandoc@v2
 

.github/workflows/linux-builder-containers.yaml

@@ -30,10 +30,10 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Login to GitHub Container Registry
-      uses: docker/login-action@v3
+      uses: docker/login-action@v4
       with:
         registry: ghcr.io
         username: ${{ github.repository_owner }}
@@ -69,10 +69,10 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Login to GitHub Container Registry
-      uses: docker/login-action@v3
+      uses: docker/login-action@v4
       with:
         registry: ghcr.io
         username: ${{ github.repository_owner }}

.github/workflows/nightly.yaml

@@ -98,7 +98,7 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         fetch-depth: 10
 
@@ -155,7 +155,7 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         fetch-depth: 10
 
@@ -220,7 +220,7 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         fetch-depth: 10
 
@@ -291,7 +291,7 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         fetch-depth: 10
 
@@ -325,13 +325,13 @@ jobs:
 
     steps:
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3
+      uses: docker/setup-qemu-action@v4
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
+      uses: docker/setup-buildx-action@v4
 
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         fetch-depth: 10
 
@@ -364,7 +364,7 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         fetch-depth: 10
 
@@ -412,7 +412,7 @@ jobs:
         sudo apt-get update
 
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         fetch-depth: 10
 
@@ -439,7 +439,7 @@ jobs:
 
     - name: Deploy to GitHub pages (test)
       if: github.event_name != 'pull_request'
-      uses: JamesIves/github-pages-deploy-action@v4.5.0
+      uses: JamesIves/github-pages-deploy-action@v4.8.0
       with:
         repository-name: r-lib/r-lib.github.io
         token: ${{ secrets.PAK_GHCR_TOKEN }}
@@ -457,7 +457,7 @@ jobs:
 
     - name: Deploy to GitHub Pages (prod)
       if: github.event_name != 'pull_request'
-      uses: JamesIves/github-pages-deploy-action@v4.5.0
+      uses: JamesIves/github-pages-deploy-action@v4.8.0
       with:
         repository-name: r-lib/r-lib.github.io
         token: ${{ secrets.PAK_GHCR_TOKEN }}

.github/workflows/pkgdown.yaml

@@ -23,7 +23,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -54,7 +54,7 @@ jobs:
 
       - name: Deploy to GitHub pages 🚀
         if: github.event_name != 'pull_request'
-        uses: JamesIves/github-pages-deploy-action@v4.5.0
+        uses: JamesIves/github-pages-deploy-action@v4.8.0
         with:
           clean: false
           branch: gh-pages

.github/workflows/pr-commands.yaml

@@ -18,7 +18,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - uses: r-lib/actions/pr-fetch@v2
         with:
@@ -57,7 +57,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - uses: r-lib/actions/pr-fetch@v2
         with:

.gitignore

@@ -31,6 +31,8 @@
 /src/library/curl/tools/option_table.txt
 /src/library/jsonlite/src/yajl/libstatyajl.a
 /src/library/pkgdepends/man/macros/eval2.Rd
+/src/library/ts/man/macros/eval2.Rd
+/src/library/tstoml/man/macros/eval2.Rd
 /src/library/processx/src/supervisor/supervisor
 /src/library/processx/src/supervisor/supervisor.dSYM/
 /src/library/processx/src/tools/px

DESCRIPTION

@@ -113,11 +113,13 @@ Config/needs/dependencies:
     keyring,
     lpSolve,
     pkgbuild,
-    pkgcache,
-    pkgdepends,
+    r-lib/pkgcache@feature/ppm-sso,
+    r-lib/pkgdepends,
     pkgsearch,
     processx,
     ps,
+    r-lib/ts,
+    gaborcsardi/tstoml,
     yaml
 Config/Needs/website:
     r-lib/asciicast,

NAMESPACE

@@ -58,6 +58,9 @@ export(ppm_platforms)
 export(ppm_r_versions)
 export(ppm_repo_url)
 export(ppm_snapshots)
+export(ppm_sso_login)
+export(ppm_sso_logout)
+export(ppm_sso_status)
 export(repo_add)
 export(repo_auth)
 export(repo_auth_key_get)

R/auth.R

@@ -9,6 +9,8 @@
 #'
 #' ```{r child = "man/chunks/auth.Rmd"}
 #' ```
+#'
+#' @seealso [repo_auth()], [ppm_sso_login()].
 NULL
 
 #' Query or set repository password in the system credential store

R/embed.R

@@ -225,6 +225,15 @@ embed <- local({
     )
 
     lib <- lib_dir()
+
+    if (grepl("@", pkg)) {
+      pkgsplit <- strsplit(pkg, "@")[[1]]
+      pkg <- pkgsplit[1]
+      ref <- pkgsplit[2]
+    } else {
+      ref <- "main"
+    }
+
     pkg_name <- sub("^.*/", "", pkg)
     if (mode == "add") {
       if (file.exists(file.path(lib, pkg_name))) {
@@ -236,8 +245,9 @@ embed <- local({
     on.exit(unlink(tmp, recursive = TRUE), add = TRUE)
     if (grepl("/", pkg)) {
       url <- sprintf(
-        "https://github.com/%s/archive/refs/heads/main.tar.gz",
-        pkg
+        "https://github.com/%s/archive/refs/heads/%s.tar.gz",
+        pkg,
+        ref
       )
       path1 <- file.path(tmp, paste0(pkg_name, ".tar.gz"))
       download.file(url, path1)
@@ -303,6 +313,7 @@ embed <- local({
       rimraf(file.path(lib, pkg, "inst", "CITATION"))
       rimraf(file.path(lib, pkg, "MD5"))
       rimraf(file.path(lib, pkg, "README.md"))
+      rimraf(file.path(lib, pkg, "inst", "tsdocs"))
     }
   }
 

R/onload.R

@@ -19,6 +19,7 @@ pkg_data <- new.env(parent = emptyenv())
     # We don't use the env vars that cli supports, on purpose, because
     # they are inherited in the subprocess of the subprocess
     options(
+      pak.is_worker = TRUE,
       cli.num_colors = as.numeric(Sys.getenv("R_PKG_NUM_COLORS", "1")),
       rlib_interactive = (Sys.getenv("R_PKG_INTERACTIVE") == "TRUE"),
       cli.dynamic = (Sys.getenv("R_PKG_DYNAMIC_TTY") == "TRUE")