Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

First release! #22

Merged
merged 122 commits into from
Jan 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
122 commits
Select commit Hold shift + click to select a range
f95a292
consolidating results! Now works for --models SingleDrugRandomForest …
JudithBernett Oct 4, 2024
417bac2
pipeline also works for cross validation now
JudithBernett Oct 8, 2024
388888d
Template update for nf-core/tools version 3.0.0
nf-core-bot Oct 8, 2024
9a26032
Template update for nf-core/tools version 3.0.1
nf-core-bot Oct 9, 2024
825f400
Template update for nf-core/tools version 3.0.2
nf-core-bot Oct 11, 2024
09d7b71
fixed that hyperparameter split is just executed per model class, not…
JudithBernett Oct 28, 2024
b4d8185
fixed error in consolidate_results.py
JudithBernett Oct 28, 2024
6f3d58a
had limited cpus to 3
JudithBernett Oct 28, 2024
71467ba
trying to have gpu support
JudithBernett Oct 31, 2024
8669fd3
trying to have gpu support pt. 2: only for specific models
JudithBernett Oct 31, 2024
bb5480b
doesn't work yet - setting label to process_gpu everywhere for now
JudithBernett Oct 31, 2024
7a6f4f0
doesn't work yet - setting label to process_gpu everywhere for now
JudithBernett Oct 31, 2024
bad410f
forgot the brackets
JudithBernett Oct 31, 2024
2fa47e7
copying results
JudithBernett Nov 4, 2024
0ca4213
more cpus for train_and_predict
JudithBernett Nov 4, 2024
a09503b
incorporated updates from the package
JudithBernett Nov 15, 2024
c8c3a1a
Merge branch 'dev' into nf-core-template-merge-3.0.1
JudithBernett Nov 15, 2024
27d583d
fixed pre-commit
JudithBernett Nov 15, 2024
3ad2c3d
Merge branch 'nf-core-template-merge-3.0.1' into single_model_restruc…
JudithBernett Nov 15, 2024
d3a8864
Merge pull request #10 from nf-core/nf-core-template-merge-3.0.1
JudithBernett Nov 15, 2024
f565bd5
Merge branch 'dev' of github.com:nf-core/drugresponseeval into dev
JudithBernett Nov 15, 2024
f0742f6
removed fastqc, multiqc. Removed max_multiqc_email_size from schema. …
JudithBernett Nov 15, 2024
246d54d
changed gitignore to include intellij .idea folder
JudithBernett Nov 15, 2024
eed2178
fixed linting
JudithBernett Nov 15, 2024
7e02d44
fixed pre-commit
JudithBernett Nov 15, 2024
a6acf53
trying to get the new logos
JudithBernett Nov 15, 2024
39826d5
new logos
JudithBernett Nov 15, 2024
30d4990
new logos
JudithBernett Nov 15, 2024
8a1d6ce
Merge branch 'TEMPLATE' of github.com:nf-core/drugresponseeval into T…
JudithBernett Nov 15, 2024
1ed774a
going to document more
JudithBernett Nov 15, 2024
29cd07d
trying to fix the images
JudithBernett Nov 15, 2024
a8622e7
trying to fix images #2
JudithBernett Nov 15, 2024
e10534d
trying to fix logo part 3
JudithBernett Nov 15, 2024
a3fa5c4
Found the problem. The hack is to switch to the TEMPLATE branch and c…
JudithBernett Nov 15, 2024
2173181
trying to fix .nf-core.yml check
JudithBernett Nov 15, 2024
a981ca7
it didn't update?
JudithBernett Nov 15, 2024
d18dfc5
fixed -profile test but still need to put the requirements on docker …
JudithBernett Nov 18, 2024
6ea8f84
added container with latest drevalpy version
JudithBernett Nov 21, 2024
f43dbbc
added conda support
JudithBernett Nov 22, 2024
a3ea0d6
Proper usage documentation
JudithBernett Nov 22, 2024
f0f9417
Proper output documentation, removed unnecessary statements in the mo…
JudithBernett Nov 22, 2024
9839312
change log for the pull request
JudithBernett Nov 22, 2024
e01cbdc
added citations for implemented and adapted drug response prediction …
JudithBernett Nov 22, 2024
268ba95
trying to fix version comment
JudithBernett Nov 25, 2024
aafd92a
trying to fix ci.yml
JudithBernett Nov 25, 2024
95cde66
trying to fix ci.yml
JudithBernett Nov 25, 2024
4af82b0
rolling back ci.yml
JudithBernett Nov 25, 2024
29c8d0d
does this template_version_comment.yml update now?
JudithBernett Nov 25, 2024
238ea46
Remove unnecessary statements in .nf-core.yml
JudithBernett Nov 25, 2024
87db9b1
remove unnecessary statements in .nf-core.yml
JudithBernett Nov 25, 2024
1936911
Merge branch 'linting_and_testing' of github.com:nf-core/drugresponse…
JudithBernett Nov 25, 2024
1857efa
sorted the cited implemented tools alphabetically, renamed the pipeli…
JudithBernett Nov 25, 2024
304a695
ignoring input parameter
JudithBernett Nov 25, 2024
004555c
forgot to remove input from nextflow.config
JudithBernett Nov 25, 2024
3d00d07
Merge pull request #11 from nf-core/linting_and_testing
JudithBernett Nov 25, 2024
5c8301a
intermediate commit, added CurveCurator logic
picciama Nov 25, 2024
5904671
Merge branch 'dev' into feature/curvecurator_module
picciama Nov 25, 2024
beaf400
Merge branch 'dev' of github.com:nf-core/drugresponseeval into dev
JudithBernett Nov 26, 2024
e2efb01
does not work with path_data as path, need it as val for -resume to work
JudithBernett Nov 29, 2024
106e497
adjusted params for new drevalpy handling
picciama Dec 2, 2024
4793866
ensured output and task requirements are correct
picciama Dec 2, 2024
d353703
fixed missing measure arg and fit_curves includes
picciama Dec 3, 2024
08cdcc8
syntax error fix in call to FIT_CURVES
picciama Dec 3, 2024
82d9193
fix missing comma in call to RUN_CV
picciama Dec 3, 2024
127d72d
added default measure and fixed arg type
picciama Dec 3, 2024
df8e42f
add missing path_data arg to params_check
picciama Dec 3, 2024
37139c5
fix syntax errors and wrong args / file modes
picciama Dec 3, 2024
e00b5cb
fixed argument parsing bug
picciama Dec 3, 2024
67b073c
add missing dataset_name arg
picciama Dec 3, 2024
069e714
separated fitting into three modules
picciama Dec 4, 2024
01b8936
fixed paths and emits
picciama Dec 4, 2024
e4bd724
fixed publishDirs
picciama Dec 4, 2024
b9f3cf2
fixed missing params ref in publishDir
picciama Dec 4, 2024
befa368
ensure LOAD_RESPONSE is waiting
picciama Dec 4, 2024
719e2ff
fixed path data problems, problem was missing params. in front of pat…
JudithBernett Dec 5, 2024
b3af48f
created separate preprocessing workflow
picciama Dec 5, 2024
66bb18b
added missing commas
picciama Dec 5, 2024
4a67fa3
Merge branch 'feature/curvecurator_module' of https://github.com/picc…
JudithBernett Dec 5, 2024
98c7800
giving path_data as value, not as channel, does not work otherwise
JudithBernett Dec 5, 2024
674bf15
giving back valid measure variables:
JudithBernett Dec 5, 2024
cd57894
remove trailing whitespaces
picciama Dec 10, 2024
9ae291b
Template update for nf-core/tools version 3.1.0
nf-core-bot Dec 12, 2024
9bcf376
c
PascalIversen Dec 16, 2024
9278626
checkpointing
PascalIversen Dec 16, 2024
9c1d83e
Template update for nf-core/tools version 3.1.1
nf-core-bot Dec 20, 2024
28ed897
deleted notes
JudithBernett Jan 13, 2025
2d6a15e
Merge branch 'feature/curvecurator_module' of https://github.com/picc…
JudithBernett Jan 13, 2025
7680d22
changing something small to retrigger github action
JudithBernett Jan 13, 2025
a5b42d0
schema
PascalIversen Jan 13, 2025
794fb17
pre-commit
PascalIversen Jan 13, 2025
d2ae9e7
auto fix lint nfcore
PascalIversen Jan 13, 2025
ef7b004
Merge branch 'dev' into nf-core-template-merge-3.1.1
JudithBernett Jan 13, 2025
9ab5af9
Merge branch 'nf-core-template-merge-3.1.1' of github.com:nf-core/dru…
JudithBernett Jan 13, 2025
6e59226
fixed pre-commit
JudithBernett Jan 13, 2025
e627d9f
fixed container and env to latest
JudithBernett Jan 13, 2025
a9f7167
Merge branch 'nf-core-template-merge-3.1.1' into global_checkpoint_dir
JudithBernett Jan 13, 2025
da69223
Merge pull request #16 from nf-core/global_checkpoint_dir
JudithBernett Jan 13, 2025
f1f5e94
Merge branch 'dev' of https://github.com/picciama/drugresponseeval in…
JudithBernett Jan 13, 2025
590f7c6
merged latest dev version
JudithBernett Jan 13, 2025
a33acb7
Merge branch 'dev' of github.com:nf-core/drugresponseeval into dev
JudithBernett Jan 13, 2025
b0d8ac6
Merge branch 'dev' into fix/datapath
JudithBernett Jan 13, 2025
a8cd55f
./data -> data
JudithBernett Jan 13, 2025
8ac0bf0
Template update for nf-core/tools version 3.1.2
nf-core-bot Jan 20, 2025
b28687f
Template update for nf-core/tools version 3.2.0
nf-core-bot Jan 27, 2025
65bfa0b
Lots of fixes:
JudithBernett Jan 29, 2025
3797462
did not work with relative default path yet, maybe now
JudithBernett Jan 29, 2025
db805e9
updated documentation
JudithBernett Jan 29, 2025
3f276ec
Merge pull request #18 from nf-core/fix/datapath
JudithBernett Jan 29, 2025
eee9a57
Merge branch 'dev' of https://github.com/picciama/drugresponseeval in…
JudithBernett Jan 29, 2025
f83dcde
merged latest dev version
JudithBernett Jan 29, 2025
f24c762
Merge branch 'dev' into nf-core-template-merge-3.2.0
JudithBernett Jan 29, 2025
9f502d6
Merge pull request #20 from nf-core/nf-core-template-merge-3.2.0
PascalIversen Jan 29, 2025
83b4f54
fixed schema
JudithBernett Jan 29, 2025
b628a0d
Merge branch 'dev' of https://github.com/picciama/drugresponseeval in…
JudithBernett Jan 29, 2025
35350da
Merge branch 'dev' into feature/curvecurator_module
JudithBernett Jan 29, 2025
a25e8d8
fixed curvecurator-related tasks to work within the Nextflow logic, i…
JudithBernett Jan 30, 2025
c7452d8
updated CITATIONS.md for curvecurator
JudithBernett Jan 30, 2025
060d2b6
updated CHANGELOG.md
JudithBernett Jan 30, 2025
1176dc4
minor changes
JudithBernett Jan 30, 2025
f69bf66
Merge pull request #14 from picciama/feature/curvecurator_module
JudithBernett Jan 30, 2025
ead067a
Update env.yml
JudithBernett Jan 30, 2025
1bd26aa
Merge pull request #21 from nf-core/JudithBernett-patch-1
JudithBernett Jan 30, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,15 @@
"name": "nfcore",
"image": "nfcore/gitpod:latest",
"remoteUser": "gitpod",
"runArgs": ["--privileged"],

// Configure tool-specific properties.
"customizations": {
// Configure properties specific to VS Code.
"vscode": {
// Set *default* container specific settings.json values on container create.
"settings": {
"python.defaultInterpreterPath": "/opt/conda/bin/python",
"python.linting.enabled": true,
"python.linting.pylintEnabled": true,
"python.formatting.autopep8Path": "/opt/conda/bin/autopep8",
"python.formatting.yapfPath": "/opt/conda/bin/yapf",
"python.linting.flake8Path": "/opt/conda/bin/flake8",
"python.linting.pycodestylePath": "/opt/conda/bin/pycodestyle",
"python.linting.pydocstylePath": "/opt/conda/bin/pydocstyle",
"python.linting.pylintPath": "/opt/conda/bin/pylint"
"python.defaultInterpreterPath": "/opt/conda/bin/python"
},

// Add the IDs of extensions you want installed when the container is created.
Expand Down
15 changes: 14 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,20 @@ end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
indent_style = unset
indent_size = unset
[/subworkflows/nf-core/**]
charset = unset
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
indent_style = unset

[/assets/email*]
indent_size = unset

# ignore python and markdown
[*.{py,md}]
indent_style = unset

# ignore ro-crate metadata files
[**/ro-crate-metadata.json]
insert_final_newline = unset
35 changes: 20 additions & 15 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# nf-core/drugresponseeval: Contributing Guidelines
# `nf-core/drugresponseeval`: Contributing Guidelines

Hi there!
Many thanks for taking an interest in improving nf-core/drugresponseeval.
Expand All @@ -9,6 +9,7 @@ Please use the pre-filled template to save time.
However, don't be put off by this template - other more general issues and suggestions are welcome!
Contributions to the code are even more welcome ;)

> [!NOTE]
> If you need help using or modifying nf-core/drugresponseeval then the best place to ask is on the nf-core Slack [#drugresponseeval](https://nfcore.slack.com/channels/drugresponseeval) channel ([join our Slack here](https://nf-co.re/join/slack)).

## Contribution workflow
Expand All @@ -18,13 +19,19 @@ If you'd like to write some code for nf-core/drugresponseeval, the standard work
1. Check that there isn't already an issue about your idea in the [nf-core/drugresponseeval issues](https://github.com/nf-core/drugresponseeval/issues) to avoid duplicating work. If there isn't one already, please create one so that others know you're working on this
2. [Fork](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) the [nf-core/drugresponseeval repository](https://github.com/nf-core/drugresponseeval) to your GitHub account
3. Make the necessary changes / additions within your forked repository following [Pipeline conventions](#pipeline-contribution-conventions)
4. Use `nf-core schema build` and add any new parameters to the pipeline JSON schema (requires [nf-core tools](https://github.com/nf-core/tools) >= 1.10).
4. Use `nf-core pipelines schema build` and add any new parameters to the pipeline JSON schema (requires [nf-core tools](https://github.com/nf-core/tools) >= 1.10).
5. Submit a Pull Request against the `dev` branch and wait for the code to be reviewed and merged

If you're not used to this workflow with git, you can start with some [docs from GitHub](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests) or even their [excellent `git` resources](https://try.github.io/).

## Tests

You have the option to test your changes locally by running the pipeline. For receiving warnings about process selectors and other `debug` information, it is recommended to use the debug profile. Execute all the tests with the following command:

```bash
nf-test test --profile debug,test,docker --verbose
```

When you create a pull request with changes, [GitHub Actions](https://github.com/features/actions) will run automatic tests.
Typically, pull-requests are only fully reviewed when these tests are passing, though of course we can help out before then.

Expand All @@ -33,7 +40,7 @@ There are typically two types of tests that run:
### Lint tests

`nf-core` has a [set of guidelines](https://nf-co.re/developers/guidelines) which all pipelines must adhere to.
To enforce these and ensure that all pipelines stay in sync, we have developed a helper tool which runs checks on the pipeline code. This is in the [nf-core/tools repository](https://github.com/nf-core/tools) and once installed can be run locally with the `nf-core lint <pipeline-directory>` command.
To enforce these and ensure that all pipelines stay in sync, we have developed a helper tool which runs checks on the pipeline code. This is in the [nf-core/tools repository](https://github.com/nf-core/tools) and once installed can be run locally with the `nf-core pipelines lint <pipeline-directory>` command.

If any failures or warnings are encountered, please follow the listed URL for more documentation.

Expand All @@ -48,44 +55,42 @@ These tests are run both with the latest available version of `Nextflow` and als

:warning: Only in the unlikely and regretful event of a release happening with a bug.

- On your own fork, make a new branch `patch` based on `upstream/master`.
- On your own fork, make a new branch `patch` based on `upstream/main` or `upstream/master`.
- Fix the bug, and bump version (X.Y.Z+1).
- A PR should be made on `master` from patch to directly this particular bug.
- Open a pull-request from `patch` to `main`/`master` with the changes.

## Getting help

For further information/help, please consult the [nf-core/drugresponseeval documentation](https://nf-co.re/drugresponseeval/usage) and don't hesitate to get in touch on the nf-core Slack [#drugresponseeval](https://nfcore.slack.com/channels/drugresponseeval) channel ([join our Slack here](https://nf-co.re/join/slack)).

## Pipeline contribution conventions

To make the nf-core/drugresponseeval code and processing logic more understandable for new contributors and to ensure quality, we semi-standardise the way the code and other contributions are written.
To make the `nf-core/drugresponseeval` code and processing logic more understandable for new contributors and to ensure quality, we semi-standardise the way the code and other contributions are written.

### Adding a new step

If you wish to contribute a new step, please use the following coding standards:

1. Define the corresponding input channel into your new process from the expected previous process channel
1. Define the corresponding input channel into your new process from the expected previous process channel.
2. Write the process block (see below).
3. Define the output channel if needed (see below).
4. Add any new parameters to `nextflow.config` with a default (see below).
5. Add any new parameters to `nextflow_schema.json` with help text (via the `nf-core schema build` tool).
5. Add any new parameters to `nextflow_schema.json` with help text (via the `nf-core pipelines schema build` tool).
6. Add sanity checks and validation for all relevant parameters.
7. Perform local tests to validate that the new code works as expected.
8. If applicable, add a new test command in `.github/workflow/ci.yml`.
9. Update MultiQC config `assets/multiqc_config.yml` so relevant suffixes, file name clean up and module plots are in the appropriate order. If applicable, add a [MultiQC](https://https://multiqc.info/) module.
10. Add a description of the output files and if relevant any appropriate images from the MultiQC report to `docs/output.md`.

### Default values

Parameters should be initialised / defined with default values in `nextflow.config` under the `params` scope.
Parameters should be initialised / defined with default values within the `params` scope in `nextflow.config`.

Once there, use `nf-core schema build` to add to `nextflow_schema.json`.
Once there, use `nf-core pipelines schema build` to add to `nextflow_schema.json`.

### Default processes resource requirements

Sensible defaults for process resource requirements (CPUs / memory / time) for a process should be defined in `conf/base.config`. These should generally be specified generic with `withLabel:` selectors so they can be shared across multiple processes/steps of the pipeline. A nf-core standard set of labels that should be followed where possible can be seen in the [nf-core pipeline template](https://github.com/nf-core/tools/blob/master/nf_core/pipeline-template/conf/base.config), which has the default process as a single core-process, and then different levels of multi-core configurations for increasingly large memory requirements defined with standardised labels.
Sensible defaults for process resource requirements (CPUs / memory / time) for a process should be defined in `conf/base.config`. These should generally be specified generic with `withLabel:` selectors so they can be shared across multiple processes/steps of the pipeline. A nf-core standard set of labels that should be followed where possible can be seen in the [nf-core pipeline template](https://github.com/nf-core/tools/blob/main/nf_core/pipeline-template/conf/base.config), which has the default process as a single core-process, and then different levels of multi-core configurations for increasingly large memory requirements defined with standardised labels.

The process resources can be passed on to the tool dynamically within the process with the `${task.cpu}` and `${task.memory}` variables in the `script:` block.
The process resources can be passed on to the tool dynamically within the process with the `${task.cpus}` and `${task.memory}` variables in the `script:` block.

### Naming schemes

Expand All @@ -96,7 +101,7 @@ Please use the following naming schemes, to make it easy to understand what is g

### Nextflow version bumping

If you are using a new feature from core Nextflow, you may bump the minimum required version of nextflow in the pipeline with: `nf-core bump-version --nextflow . [min-nf-version]`
If you are using a new feature from core Nextflow, you may bump the minimum required version of nextflow in the pipeline with: `nf-core pipelines bump-version --nextflow . [min-nf-version]`

### Images and figures

Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ body:

- [nf-core website: troubleshooting](https://nf-co.re/usage/troubleshooting)
- [nf-core/drugresponseeval pipeline documentation](https://nf-co.re/drugresponseeval/usage)

- type: textarea
id: description
attributes:
Expand Down
3 changes: 2 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/drug
- [ ] If you've fixed a bug or added code that should be tested, add tests!
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/drugresponseeval/tree/master/.github/CONTRIBUTING.md)
- [ ] If necessary, also make a PR on the nf-core/drugresponseeval _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
- [ ] Make sure your code lints (`nf-core lint`).
- [ ] Make sure your code lints (`nf-core pipelines lint`).
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir <OUTDIR>`).
- [ ] Check for unexpected warnings in debug mode (`nextflow run . -profile debug,test,docker --outdir <OUTDIR>`).
- [ ] Usage Documentation in `docs/usage.md` is updated.
- [ ] Output Documentation in `docs/output.md` is updated.
- [ ] `CHANGELOG.md` is updated.
Expand Down
50 changes: 40 additions & 10 deletions .github/workflows/awsfulltest.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,49 @@
name: nf-core AWS full size tests
# This workflow is triggered on published releases.
# This workflow is triggered on PRs opened against the main/master branch.
# It can be additionally triggered manually with GitHub actions workflow dispatch button.
# It runs the -profile 'test_full' on AWS batch

on:
release:
types: [published]
pull_request:
branches:
- main
- master
workflow_dispatch:
pull_request_review:
types: [submitted]

jobs:
run-tower:
run-platform:
name: Run AWS full tests
if: github.repository == 'nf-core/drugresponseeval'
# run only if the PR is approved by at least 2 reviewers and against the master branch or manually triggered
if: github.repository == 'nf-core/drugresponseeval' && github.event.review.state == 'approved' && github.event.pull_request.base.ref == 'master' || github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
steps:
- name: Launch workflow via tower
- name: Get PR reviews
uses: octokit/request-action@v2.x
if: github.event_name != 'workflow_dispatch'
id: check_approvals
continue-on-error: true
with:
route: GET /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/reviews?per_page=100
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Check for approvals
if: ${{ failure() && github.event_name != 'workflow_dispatch' }}
run: |
echo "No review approvals found. At least 2 approvals are required to run this action automatically."
exit 1

- name: Check for enough approvals (>=2)
id: test_variables
if: github.event_name != 'workflow_dispatch'
run: |
JSON_RESPONSE='${{ steps.check_approvals.outputs.data }}'
CURRENT_APPROVALS_COUNT=$(echo $JSON_RESPONSE | jq -c '[.[] | select(.state | contains("APPROVED")) ] | length')
test $CURRENT_APPROVALS_COUNT -ge 2 || exit 1 # At least 2 approvals are required

- name: Launch workflow via Seqera Platform
uses: seqeralabs/action-tower-launch@v2
# TODO nf-core: You can customise AWS full pipeline tests as required
# Add full size test data (but still relatively small datasets for few samples)
Expand All @@ -31,9 +61,9 @@ jobs:
}
profiles: test_full

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Tower debug log file
name: Seqera Platform debug log file
path: |
tower_action_*.log
tower_action_*.json
seqera_platform_action_*.log
seqera_platform_action_*.json
14 changes: 7 additions & 7 deletions .github/workflows/awstest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ name: nf-core AWS test
on:
workflow_dispatch:
jobs:
run-tower:
run-platform:
name: Run AWS tests
if: github.repository == 'nf-core/drugresponseeval'
runs-on: ubuntu-latest
steps:
# Launch workflow using Tower CLI tool action
- name: Launch workflow via tower
# Launch workflow using Seqera Platform CLI tool action
- name: Launch workflow via Seqera Platform
uses: seqeralabs/action-tower-launch@v2
with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
Expand All @@ -25,9 +25,9 @@ jobs:
}
profiles: test

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Tower debug log file
name: Seqera Platform debug log file
path: |
tower_action_*.log
tower_action_*.json
seqera_platform_action_*.log
seqera_platform_action_*.json
20 changes: 11 additions & 9 deletions .github/workflows/branch.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
name: nf-core branch protection
# This workflow is triggered on PRs to master branch on the repository
# It fails when someone tries to make a PR against the nf-core `master` branch instead of `dev`
# This workflow is triggered on PRs to `main`/`master` branch on the repository
# It fails when someone tries to make a PR against the nf-core `main`/`master` branch instead of `dev`
on:
pull_request_target:
branches: [master]
branches:
- main
- master

jobs:
test:
runs-on: ubuntu-latest
steps:
# PRs to the nf-core repo master branch are only ok if coming from the nf-core repo `dev` or any `patch` branches
# PRs to the nf-core repo main/master branch are only ok if coming from the nf-core repo `dev` or any `patch` branches
- name: Check PRs
if: github.repository == 'nf-core/drugresponseeval'
run: |
Expand All @@ -19,10 +21,10 @@ jobs:
# NOTE - this doesn't currently work if the PR is coming from a fork, due to limitations in GitHub actions secrets
- name: Post PR comment
if: failure()
uses: mshick/add-pr-comment@v1
uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2
with:
message: |
## This PR is against the `master` branch :x:
## This PR is against the `${{github.event.pull_request.base.ref}}` branch :x:

* Do not close this PR
* Click _Edit_ and change the `base` to `dev`
Expand All @@ -32,9 +34,9 @@ jobs:

Hi @${{ github.event.pull_request.user.login }},

It looks like this pull-request is has been made against the [${{github.event.pull_request.head.repo.full_name }}](https://github.com/${{github.event.pull_request.head.repo.full_name }}) `master` branch.
The `master` branch on nf-core repositories should always contain code from the latest release.
Because of this, PRs to `master` are only allowed if they come from the [${{github.event.pull_request.head.repo.full_name }}](https://github.com/${{github.event.pull_request.head.repo.full_name }}) `dev` branch.
It looks like this pull-request is has been made against the [${{github.event.pull_request.head.repo.full_name }}](https://github.com/${{github.event.pull_request.head.repo.full_name }}) ${{github.event.pull_request.base.ref}} branch.
The ${{github.event.pull_request.base.ref}} branch on nf-core repositories should always contain code from the latest release.
Because of this, PRs to ${{github.event.pull_request.base.ref}} are only allowed if they come from the [${{github.event.pull_request.head.repo.full_name }}](https://github.com/${{github.event.pull_request.head.repo.full_name }}) `dev` branch.

You do not need to close this PR, you can change the target branch to `dev` by clicking the _"Edit"_ button at the top of this page.
Note that even after this, the test will continue to show as failing until you push a new commit.
Expand Down
Loading
Loading