From b5a25ebbbb99f6d9a7c961c6fb4adbd24373f6c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Lindel=C3=B8v?= Date: Fri, 3 May 2024 01:47:11 +0200 Subject: [PATCH 1/3] Bump version --- DESCRIPTION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 8d2403b..2974606 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: job Title: Run Code as an RStudio Job - Free Your Console -Version: 0.3.0 -Date: 2021-06-04 +Version: 0.3.1 +Date: 2024-05-03 URL: https://lindeloev.github.io/job/ BugReports: https://github.com/lindeloev/job/issues Authors@R: @@ -14,7 +14,7 @@ Description: Call job::job({}) to run R code as an RStudio job and ke License: MIT + file LICENSE Encoding: UTF-8 Roxygen: list(markdown = TRUE) -RoxygenNote: 7.1.1 +RoxygenNote: 7.3.1 Language: en-US Depends: R (>= 3.5.0) Imports: From e1cde057874a2d93808ff92c99c3f24e5e073430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Lindel=C3=B8v?= Date: Fri, 3 May 2024 02:02:07 +0200 Subject: [PATCH 2/3] Update GH workflow --- .github/workflows/R-CMD-check.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 54c737f..e617b20 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -6,6 +6,7 @@ on: pull_request: branches: - master + workflow_dispatch: name: R-CMD-check @@ -25,9 +26,9 @@ jobs: #- {os: windows-latest, r: 'oldrel'} #- {os: ubuntu-16.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"} #- {os: ubuntu-18.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"} - - {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest", http-user-agent: "R/4.0.0 (ubuntu-18.04) R (4.0.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" } - - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - - {os: ubuntu-18.04, r: 'oldrel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"} + - {os: ubuntu-latest, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest", http-user-agent: "R/4.0.0 (ubuntu-18.04) R (4.0.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" } + - {os: ubuntu-latest, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + - {os: ubuntu-latest, r: 'oldrel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"} #- {os: ubuntu-18.04, r: '3.5', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"} #- {os: ubuntu-18.04, r: '3.4', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"} #- {os: ubuntu-18.04, r: '3.3', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"} @@ -39,13 +40,14 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: r-lib/actions/setup-r@v1 + - uses: r-lib/actions/setup-r@v2 id: install-r with: r-version: ${{ matrix.config.r }} http-user-agent: ${{ matrix.config.http-user-agent }} + use-public-rspm: true - - uses: r-lib/actions/setup-pandoc@v1 + - uses: r-lib/actions/setup-pandoc@v2 - name: Install pak and query dependencies run: | From 5aef9cfbe5f910a901f20b42a72ce06b68904ff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Lindel=C3=B8v?= Date: Fri, 3 May 2024 02:19:28 +0200 Subject: [PATCH 3/3] Fix testthat for non-rstudio sessions --- tests/testthat/test_job.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testthat/test_job.R b/tests/testthat/test_job.R index f070417..f9a038f 100644 --- a/tests/testthat/test_job.R +++ b/tests/testthat/test_job.R @@ -389,5 +389,5 @@ if (rstudioapi::isAvailable()) { rm(list = ls(all.names = TRUE)) rm(list = ls(all.names = TRUE, envir = globalenv())) } else { - expect_error(job::job({a = 1}), pattern = "You must run this from the RStudio main session.") + expect_error(job::job({a = 1}), "You must run this from the RStudio main session.") }