Merge pull request #819 from eeholmes/main

R/install-github.R

@@ -243,7 +243,7 @@ remote_package_name.github_remote <- function(remote, ..., use_local = TRUE,
   # Otherwise lookup the package name from the remote DESCRIPTION file
   desc <- github_DESCRIPTION(username = remote$username, repo = remote$repo,
     subdir = remote$subdir, host = remote$host, ref = remote$ref,
-    pat = remote$auth_token %||% github_pat(), use_curl = use_curl)
+    pat = remote$auth_token, use_curl = use_curl)
 
   if (is.null(desc)) {
     return(NA_character_)
@@ -260,7 +260,7 @@ remote_package_name.github_remote <- function(remote, ..., use_local = TRUE,
 remote_sha.github_remote <- function(remote, ..., use_curl = !is_standalone() && pkg_installed("curl")) {
   tryCatch(
     github_commit(username = remote$username, repo = remote$repo,
-      host = remote$host, ref = remote$ref, pat = remote$auth_token %||% github_pat(), use_curl = use_curl),
+      host = remote$host, ref = remote$ref, pat = remote$auth_token, use_curl = use_curl),
 
     # 422 errors most often occur when a branch or PR has been deleted, so we
     # ignore the error in this case

tests/testthat/test-install-github.R

@@ -3,6 +3,11 @@ test_that("github_resolve_ref.github_release", {
   skip_on_cran()
   skip_if_offline()
   skip_if_over_rate_limit()
+  # skip in GHA PRs, no token
+  if (Sys.getenv("GITHUB_ACTIONS") == "true" &&
+      startsWith(Sys.getenv("GITHUB_REF"), "refs/pull")) {
+    skip("GHA pull request, no token")
+  }
 
   expect_error(
     github_resolve_ref.github_release(
@@ -38,6 +43,11 @@ test_that("github_resolve_ref.github_release", {
   skip_on_cran()
   skip_if_offline()
   skip_if_over_rate_limit()
+  # skip in GHA PRs, no token
+  if (Sys.getenv("GITHUB_ACTIONS") == "true" &&
+      startsWith(Sys.getenv("GITHUB_REF"), "refs/pull")) {
+    skip("GHA pull request, no token")
+  }
 
   expect_error(
     github_resolve_ref(
@@ -54,6 +64,11 @@ test_that("github_release", {
   skip_on_cran()
   skip_if_offline()
   skip_if_over_rate_limit()
+  # skip in GHA PRs, no token
+  if (Sys.getenv("GITHUB_ACTIONS") == "true" &&
+      startsWith(Sys.getenv("GITHUB_REF"), "refs/pull")) {
+    skip("GHA pull request, no token")
+  }
 
   Sys.unsetenv("R_TESTS")
 
@@ -79,6 +94,11 @@ test_that("install_github", {
   skip_on_cran()
   skip_if_offline()
   skip_if_over_rate_limit()
+  # skip in GHA PRs, no token
+  if (Sys.getenv("GITHUB_ACTIONS") == "true" &&
+      startsWith(Sys.getenv("GITHUB_REF"), "refs/pull")) {
+    skip("GHA pull request, no token")
+  }
 
   Sys.unsetenv("R_TESTS")
 
@@ -110,6 +130,11 @@ test_that("error if not username, warning if given as argument", {
   skip_on_cran()
   skip_if_offline()
   skip_if_over_rate_limit()
+  # skip in GHA PRs, no token
+  if (Sys.getenv("GITHUB_ACTIONS") == "true" &&
+      startsWith(Sys.getenv("GITHUB_REF"), "refs/pull")) {
+    skip("GHA pull request, no token")
+  }
 
   Sys.unsetenv("R_TESTS")
 
@@ -153,6 +178,11 @@ test_that("remote_sha.github_remote", {
   skip_on_cran()
   skip_if_offline()
   skip_if_over_rate_limit()
+  # skip in GHA PRs, no token
+  if (Sys.getenv("GITHUB_ACTIONS") == "true" &&
+      startsWith(Sys.getenv("GITHUB_REF"), "refs/pull")) {
+    skip("GHA pull request, no token")
+  }
 
   expect_equal(
     remote_sha.github_remote(
@@ -176,6 +206,11 @@ test_that("github_remote with deleted branch", {
   # skip this test unless we are using curl
   skip_if(is_standalone() || !pkg_installed("curl"))
 
+  # skip in GHA PRs, no token
+  if (Sys.getenv("GITHUB_ACTIONS") == "true" &&
+      startsWith(Sys.getenv("GITHUB_REF"), "refs/pull")) {
+    skip("GHA pull request, no token")
+  }
 
   expect_equal(
     remote_sha.github_remote(
@@ -198,6 +233,11 @@ test_that("github_pull", {
   skip_on_cran()
   skip_if_offline()
   skip_if_over_rate_limit()
+  # skip in GHA PRs, no token
+  if (Sys.getenv("GITHUB_ACTIONS") == "true" &&
+      startsWith(Sys.getenv("GITHUB_REF"), "refs/pull")) {
+    skip("GHA pull request, no token")
+  }
 
   Sys.unsetenv("R_TESTS")
 
@@ -222,6 +262,11 @@ test_that("remote_sha.github_remote errors if remote doesn't exist", {
   skip_on_cran()
   skip_if_offline()
   skip_if_over_rate_limit()
+  # skip in GHA PRs, no token
+  if (Sys.getenv("GITHUB_ACTIONS") == "true" &&
+      startsWith(Sys.getenv("GITHUB_REF"), "refs/pull")) {
+    skip("GHA pull request, no token")
+  }
 
   expect_error(remote_sha(github_remote("arst/arst")))
 })
@@ -230,6 +275,11 @@ test_that("remote_sha.github_remote returns expected value if remote does exist"
   skip_on_cran()
   skip_if_offline()
   skip_if_over_rate_limit()
+  # skip in GHA PRs, no token
+  if (Sys.getenv("GITHUB_ACTIONS") == "true" &&
+      startsWith(Sys.getenv("GITHUB_REF"), "refs/pull")) {
+    skip("GHA pull request, no token")
+  }
 
   expect_equal(remote_sha(github_remote("r-lib/[email protected]")), "ad9aac7b9a522354e1ff363a86f389e32cec181b")
 })