Skip to content

Commit 59692e7

Browse files
authored
undo dev versioning
1 parent cf898ab commit 59692e7

File tree

3 files changed

+0
-7
lines changed

3 files changed

+0
-7
lines changed

.github/workflows/pkgup.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
Rscript -e 'stopifnot(file.copy("DESCRIPTION", file.path(tdir<-tempdir(), "PACKAGES"))); db<-available.packages(paste0("file://", tdir)); deps<-setdiff(tools::package_dependencies(read.dcf("DESCRIPTION", fields="Package")[[1L]], db, which="most")[[1L]], installed.packages(priority="high")[,"Package"]); if (length(deps)) { ap<-available.packages()[,"Version"]; ap<-ap[names(ap) %in% deps]; if (!all(deps%in%names(ap))) stop("dependencies are not avaiable in repository: ",paste(setdiff(deps, names(ap)), collapse=", ")); ip<-installed.packages()[,"Version"]; ip<-ip[names(ip) %in% deps]; pkgs<-ap[deps]>ip[deps]; install.packages(names(pkgs[pkgs|is.na(pkgs)]), INSTALL_opts="--html") }'
4040
- name: build
4141
run: |
42-
sed -i "0,/^Version: [0-9.]\+$/s//&-$(TZ=UTC git log -1 --format=%ct)/" ./DESCRIPTION
4342
echo "Revision:" $GITHUB_SHA >> ./DESCRIPTION
4443
R CMD build .
4544
- name: check

.gitlab-ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ build:
7777
- rm -r bus
7878
script:
7979
- sed -i '/^[[:space:]]*$/d' ./DESCRIPTION ## make last line end abruptly; i.e. without a final \n
80-
- |
81-
sed -i "0,/^Version: [0-9.]\+$/s//&-$(date -d "$CI_COMMIT_TIMESTAMP" +%s)/" ./DESCRIPTION
8280
- echo "Revision:" $CI_COMMIT_SHA >> ./DESCRIPTION
8381
- R CMD build .
8482
- mkdir -p bus/$CI_JOB_NAME/

R/onLoad.R

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
# check when installed package is loaded but skip when developing the package with cc()
1515
dllV = if (is.loaded("CdllVersion",PACKAGE="data_table")) .Call(CdllVersion) else "before 1.12.0"
1616
RV = as.character(packageVersion("data.table"))
17-
if (sum(.dots <- charToRaw(RV) == charToRaw(".")) > 2L) {
18-
## trim dev version suffix 1.17.99-1234567890, note that base:::package_version turns `-` into `.` #7339
19-
RV = substring(RV, 1L, which(.dots)[3L]-1L)
20-
}
2117
if (dllV != RV) {
2218
dll = if (.Platform$OS.type=="windows") "dll" else "so"
2319
# https://bugs.r-project.org/bugzilla/show_bug.cgi?id=17478

0 commit comments

Comments
 (0)