Merge branch 'release-1.2.1' into dev

ocbe-uio · Oct 10, 2023 · ea71951 · ea71951
2 parents 667026c + 4013bd4
commit ea71951
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,7 +2,7 @@
 # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on:
   push:
-    branches: [dev, master]
+    branches: [dev, master, release-*]
   pull_request:
     branches: [dev, master]
 

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -2,7 +2,7 @@
 # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on:
   push:
-    branches: [dev, master]
+    branches: [dev, master, release-*]
   pull_request:
     branches: [dev, master]
 

diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -2,7 +2,7 @@
 # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on:
   push:
-    branches: [dev, master]
+    branches: [dev, master, release-*]
   pull_request:
     branches: [dev, master]
 

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: DIscBIO
-Date: 2021-04-28
+Date: 2023-10-09
 Title: A User-Friendly Pipeline for Biomarker Discovery in Single-Cell Transcriptomics
-Version: 1.2.0.9005
+Version: 1.2.1
 Authors@R:
   c(
     person(

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# DIscBIO (development version)
+# DIscBIO 1.2.1
 
 * Fixed integration and unit tests (issue #22, #37)
 * Improved coding style (issue #38)