Skip to content

Commit

Permalink
Install .NET in rworkflows.yml.
Browse files Browse the repository at this point in the history
  • Loading branch information
Tomrrr1 committed Mar 1, 2024
1 parent a8fa6bc commit a78916c
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 17 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/rworkflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ jobs:
cont: ~
rspm: ~
steps:
- name: Install zlib
if: ${{ matrix.config.os == 'macOS-latest' }}
run: |
brew install zlib
- name: Setup .NET # Install dotnet v6.0.x to run mspc
uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.x'
- uses: neurogenomics/rworkflows@master
with:
run_bioccheck: ${{ false }}
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: ConsensusPeak
Title: Call consensus peaks from multiple biological replicates
Version: 0.0.0.9000
Version: 0.0.0.9001
Authors@R:
person(given = "Thomas", family = "Roberts",
email = "[email protected]",
Expand Down
2 changes: 1 addition & 1 deletion R/check_dotnet_version.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ check_dotnet_version <- function() {
check <- system("dotnet --info", intern = TRUE)
version_line <- grep("^\\s*Version:\\s*\\d\\..*$", check, value = TRUE)[1]
major_version <- gsub("^\\s*Version:\\s*", "", version_line)
if (as.numeric(gsub("^(\\d+)\\..*$", "\\1", major_version)) != 6) {
if (as.numeric(gsub("^(\\d+)\\..*$", "\\1", major_version)) < 6) {
stopper("")
}
messager(
Expand Down
10 changes: 3 additions & 7 deletions R/messager.R
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,12 @@
#' must first be stored to a variable before passing to \link[base]{message}.
#'
#' @param v Whether to print messages or not.
#' @param parallel Whether to enable message print when wrapped
#' in parallelised functions.
#'
#' @return NULL
#' @keywords internal
messager <- function(..., v = TRUE, parallel = FALSE) {
if(parallel){
if(v) try({message_parallel(...)})
} else {
messager <- function(..., v = TRUE) {
if(v){
msg <- paste(...)
if (v) try({message(msg)})
try({message(msg)})
}
}
5 changes: 1 addition & 4 deletions man/messager.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a78916c

Please sign in to comment.