Skip to content

Commit 3feeb78

Browse files
author
tnagler
committed
Merge branch 'main' into fix-termination
2 parents 5524619 + 4c4d440 commit 3feeb78

5 files changed

Lines changed: 22 additions & 16 deletions

File tree

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ jobs:
2020
config:
2121
- {os: macOS-latest, r: 'release'}
2222
- {os: windows-latest, r: 'release'}
23-
- {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest", http-user-agent: "R/4.0.0 (ubuntu-16.04) R (4.0.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" }
24-
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
25-
- {os: ubuntu-20.04, r: 'oldrel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
23+
- {os: ubuntu-latest, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/jammy/latest", http-user-agent: "R/devel (ubuntu-122.04) on GitHub Actions" }
24+
- {os: ubuntu-latest, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/jammy/latest"}
25+
- {os: ubuntu-latest, r: 'oldrel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/jammy/latest"}
2626

2727
env:
2828
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
2929
RSPM: ${{ matrix.config.rspm }}
3030
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
3131

3232
steps:
33-
- uses: actions/checkout@v2
33+
- uses: actions/checkout@v5
3434

3535
- uses: r-lib/actions/setup-r@v2
3636
with:
@@ -48,7 +48,7 @@ jobs:
4848

4949
- name: Cache R packages
5050
if: runner.os != 'Windows'
51-
uses: actions/cache@v1
51+
uses: actions/cache@v5
5252
with:
5353
path: ${{ env.R_LIBS_USER }}
5454
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
@@ -57,10 +57,11 @@ jobs:
5757
- name: Install system dependencies
5858
if: runner.os == 'Linux'
5959
run: |
60+
sudo apt install libcurl4-openssl-dev
6061
while read -r cmd
6162
do
6263
eval sudo $cmd
63-
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "16.04"))')
64+
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "22.04"))')
6465
6566
- name: Install dependencies
6667
run: |

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: RcppThread
22
Title: R-Friendly Threading in C++
3-
Version: 2.2.0
3+
Version: 2.2.0.9000
44
Authors@R: c(
55
person("Thomas", "Nagler",, "mail@tnagler.com", role = c("aut", "cre"),
66
comment = c(ORCID = "0000-0003-1855-0046"))
@@ -12,7 +12,7 @@ License: MIT + file LICENSE
1212
Encoding: UTF-8
1313
URL: https://github.com/tnagler/RcppThread
1414
BugReports: https://github.com/tnagler/RcppThread/issues
15-
RoxygenNote: 7.3.2.9000
15+
RoxygenNote: 7.3.3
1616
Suggests:
1717
testthat,
1818
R.rsp,

NEWS.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# RcppThread (development version)
2+
13
# RcppThread 2.2.0
24

35
NEW FEATURE

cran-comments.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
Also includes a fix for the @doctype isseu (now documenting "_PACKAGE" instead of NULL).
2-
31
## Test environments
42

5-
* ubuntu 22.04 (devel, release, old-rel)
6-
* macOS X (release)
7-
* Windows Server 2019 (release)
3+
* ubuntu 20.04 (devel, release, old-rel)
4+
* macOS 14.7.2 (release)
5+
* Windows Server 2022 (release)
86
* CRAN win builder (devel)
97

108
## Check status summary
119

12-
NOTE OK
13-
Source packages 0 1
14-
Reverse depends 19 3
10+
We checked 19 reverse dependencies (1 from CRAN + 18 from Bioconductor),
11+
comparing R CMD check results across CRAN and dev versions of this package.
12+
13+
* We saw 0 new problems
14+
* We failed to check 0 packages

inst/include/RcppThread/Progress.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ class ProgressPrinter {
3030
, startTime_(std::chrono::steady_clock::now())
3131
{}
3232

33+
// Add virtual destructor
34+
virtual ~ProgressPrinter() = default;
35+
3336
//! prints progress whenever an update is necessary.
3437
virtual void printProgress() = 0;
3538

0 commit comments

Comments
 (0)