Skip to content

Commit 32e038d

Browse files
authored
Merge branch 'dev' into ci_relative_paths
2 parents 1f228a2 + bc4ec0c commit 32e038d

File tree

4 files changed

+25
-22
lines changed

4 files changed

+25
-22
lines changed

.github/workflows/cloud_tests_full.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
name: full-sized tests on cloud providers
22
run-name: Submitting workflow to all cloud providers using full sized data
33
on:
4+
release:
5+
types: [published]
46
workflow_dispatch:
57
inputs:
6-
platform:
7-
description: 'Platform to run test'
8-
required: true
9-
default: 'all'
10-
type: choice
11-
options:
12-
- all
13-
- aws
14-
- azure
15-
- gcp
8+
platform:
9+
description: "Platform to run test"
10+
required: true
11+
default: "all"
12+
type: choice
13+
options:
14+
- all
15+
- aws
16+
- azure
17+
- gcp
1618
jobs:
1719
run-full-tests-on-aws:
1820
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'aws' }}

.github/workflows/cloud_tests_small.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ run-name: Submitting workflow to all cloud providers using small sized data
33
on:
44
workflow_dispatch:
55
inputs:
6-
platform:
7-
description: 'Platform to run test'
8-
required: true
9-
default: 'all'
10-
type: choice
11-
options:
12-
- all
13-
- aws
14-
- azure
15-
- gcp
6+
platform:
7+
description: "Platform to run test"
8+
required: true
9+
default: "all"
10+
type: choice
11+
options:
12+
- all
13+
- aws
14+
- azure
15+
- gcp
1616
jobs:
1717
run-small-tests-on-aws:
1818
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'aws' }}

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
44
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
55

6-
## [[3.11.0](https://github.com/nf-core/rnaseq/releases/tag/3.11.0)] - 2023-03-29
6+
## [[3.11.0](https://github.com/nf-core/rnaseq/releases/tag/3.11.0)] - 2023-03-30
77

88
### Credits
99

@@ -37,6 +37,7 @@ Thank you to everyone else that has contributed by reporting bugs, enhancements
3737
- [[#961](https://github.com/nf-core/rnaseq/issues/961)] - Add warnings to STDOUT for all skipped and failed strandedness check samples
3838
- [[#975](https://github.com/nf-core/rnaseq/issues/975)] - `SALMON_INDEX` runs when using `--aligner star_rsem` even if samples have explicit strandedness
3939
- Remove HISAT2 from automated AWS full-sized tests
40+
- [[#988](https://github.com/nf-core/rnaseq/issues/988)] - `DESEQ2_QC_STAR_SALMON` fails when sample names have many components
4041
- Fix issue with incorrect cacheing of test datasets during CI/CD
4142

4243
### Parameters

bin/deseq2_qc.r

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ decompose <- n_components!=1 && all(sapply(name_components, length)==n_com
7777
coldata <- data.frame(samples.vec, sample=samples.vec, row.names=1)
7878
if (decompose) {
7979
groupings <- as.data.frame(lapply(1:n_components, function(i) sapply(name_components, "[[", i)))
80-
names(groupings) <- paste0("Group", 1:n_components)
8180
n_distinct <- sapply(groupings, function(grp) length(unique(grp)))
8281
groupings <- groupings[n_distinct!=1 & n_distinct!=length(samples.vec)]
8382
if (ncol(groupings)!=0) {
83+
names(groupings) <- paste0("Group", 1:ncol(groupings))
8484
coldata <- cbind(coldata, groupings)
8585
} else {
8686
decompose <- FALSE

0 commit comments

Comments
 (0)