From 1e058b56acae8122daf29ebecf903488f4ab112e Mon Sep 17 00:00:00 2001 From: Waldir Leoncio Date: Mon, 9 Oct 2023 10:03:52 +0200 Subject: [PATCH 1/3] Increment version number to 1.2.1 --- DESCRIPTION | 2 +- NEWS.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index a31883f..2212a59 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: DIscBIO Date: 2021-04-28 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 index 621f5fa..82fc671 100644 --- 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) From 21463269e28c05daf2181507018f1df663c4528e Mon Sep 17 00:00:00 2001 From: Waldir Leoncio Date: Mon, 9 Oct 2023 10:12:17 +0200 Subject: [PATCH 2/3] Updated package date --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 2212a59..4f0bf7b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ 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.1 Authors@R: From 4013bd440ddba8b609750d1bca0020fdbaaeeff3 Mon Sep 17 00:00:00 2001 From: Waldir Leoncio Date: Mon, 9 Oct 2023 10:24:14 +0200 Subject: [PATCH 3/3] Added release branches to CI triggers --- .github/workflows/build.yml | 2 +- .github/workflows/linter.yml | 2 +- .github/workflows/test-coverage.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 79edc16..08bb905 100644 --- 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 index 809f516..725d84c 100644 --- 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 index 08290b5..ad62d53 100644 --- 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]