Skip to content

Commit

Permalink
Merge branch 'devel' into smaller_screenshots
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinrue authored Feb 13, 2025
2 parents e92f0dd + 79c4466 commit dbeb06c
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 14 deletions.
13 changes: 7 additions & 6 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
^renv$
^renv\.lock$
^iSEEhub\.Rproj$
^\.Rproj\.user$
^dev$
^README\.Rmd$
^\.github$
^\.Rproj\.user$
^_pkgdown.yml$
^iSEEhub\.Rproj$
^codecov\.yml$
^dev$
^pkgdown$
^README\.Rmd$
^renv$
^renv\.lock$
12 changes: 6 additions & 6 deletions .github/workflows/check-bioc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ jobs:
gha_repos <- if(
.Platform$OS.type == "unix" && Sys.info()["sysname"] != "Darwin"
) c(
"AnVIL" = "https://bioconductordocker.blob.core.windows.net/packages/3.17/bioc",
"AnVIL" = "https://bioconductordocker.blob.core.windows.net/packages/3.20/bioc",
BiocManager::repositories()
) else BiocManager::repositories()
Expand Down Expand Up @@ -213,13 +213,13 @@ jobs:
shell: Rscript {0}

- name: Install covr
if: github.ref == 'refs/heads/main' && env.run_covr == 'true' && runner.os == 'Linux'
if: github.ref == 'refs/heads/devel' && env.run_covr == 'true' && runner.os == 'Linux'
run: |
remotes::install_cran("covr")
shell: Rscript {0}

- name: Install pkgdown
if: github.ref == 'refs/heads/main' && env.run_pkgdown == 'true' && runner.os == 'Linux'
if: github.ref == 'refs/heads/devel' && env.run_pkgdown == 'true' && runner.os == 'Linux'
run: |
remotes::install_cran("pkgdown")
shell: Rscript {0}
Expand Down Expand Up @@ -269,17 +269,17 @@ jobs:
shell: Rscript {0}

- name: Test coverage
if: github.ref == 'refs/heads/main' && env.run_covr == 'true' && runner.os == 'Linux'
if: github.ref == 'refs/heads/devel' && env.run_covr == 'true' && runner.os == 'Linux'
run: |
covr::codecov()
shell: Rscript {0}

- name: Install package
if: github.ref == 'refs/heads/main' && env.run_pkgdown == 'true' && runner.os == 'Linux'
if: github.ref == 'refs/heads/devel' && env.run_pkgdown == 'true' && runner.os == 'Linux'
run: R CMD INSTALL .

- name: Build and deploy pkgdown site
if: github.ref == 'refs/heads/main' && env.run_pkgdown == 'true' && runner.os == 'Linux'
if: github.ref == 'refs/heads/devel' && env.run_pkgdown == 'true' && runner.os == 'Linux'
run: |
git config --global user.name "$GITHUB_ACTOR"
git config --global user.email "[email protected]"
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: iSEEhub
Title: iSEE for the Bioconductor ExperimentHub
Version: 1.5.1
Date: 2024-07-02
Version: 1.7.1
Date: 2024-10-01
Authors@R:
c(person("Kevin", "Rue-Albrecht", , "[email protected]",
role = c("aut", "cre"),
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# iSEEhub 1.7.1

* Version bump to rebuild classes derived from `DotPlot`.

# iSEEhub 1.3.2

BUG FIXES
Expand Down
3 changes: 3 additions & 0 deletions _pkgdown.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
url: https://isee.github.io/iSEEhub/
template:
bootstrap: 5

0 comments on commit dbeb06c

Please sign in to comment.