Skip to content

Commit 73be4c1

Browse files
authored
fix: add apptainer source, yml formatting (#45)
* fix: add apptainer source, yml formatting * fix: added apptainer installation to test wf, yaml formatting
1 parent 4e2fd67 commit 73be4c1

File tree

2 files changed

+27
-26
lines changed

2 files changed

+27
-26
lines changed

.github/workflows/main.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@ on:
99

1010
jobs:
1111
build:
12-
1312
runs-on: ubuntu-latest
14-
13+
1514
steps:
16-
- uses: actions/checkout@v1
15+
- uses: actions/checkout@v4
16+
17+
- name: Test run
18+
uses: ./
19+
with:
20+
directory: .test
21+
snakefile: .test/Snakefile
22+
args: "--cores 1"
1723

18-
- name: Test run
19-
uses: ./
20-
with:
21-
directory: .test
22-
snakefile: .test/Snakefile
23-
args: "--cores 1"
24+
- name: Test containerize
25+
uses: ./
26+
with:
27+
directory: .test
28+
snakefile: .test/Snakefile
29+
install-apptainer: true
30+
args: "--cores 1"
31+
task: "containerize"
2432

25-
- name: Test containerize
26-
uses: ./
27-
with:
28-
directory: .test
29-
snakefile: .test/Snakefile
30-
args: "--cores 1"
31-
task: "containerize"
32-
33-
- name: Show Dockerfile
34-
run: |
35-
cat Dockerfile
33+
- name: Show Dockerfile
34+
run: |
35+
cat Dockerfile

action.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,30 +17,30 @@ inputs:
1717
args:
1818
description: Additional Snakemake arguments to use
1919
required: false
20-
default: ''
20+
default: ""
2121
stagein:
2222
description: Additional steps to prepare the workflow for execution
2323
required: false
24-
default: ''
24+
default: ""
2525
task:
2626
description: Whether to run Snakemake or to generate a container image specification.
2727
required: false
28-
default: 'run'
28+
default: "run"
2929
show-disk-usage-on-error:
3030
description: Whether to return the used disk space on failing.
3131
required: false
3232
default: false
3333
snakemake-version:
3434
description: Snakemake version to use. If not specified, uses latest version. Pin a specific version (e.g., '8.25.5') for reproducibility.
3535
required: false
36-
default: '*'
36+
default: "*"
3737
install-apptainer:
3838
description: Install Apptainer (true/false)
3939
required: false
4040
default: false
4141

4242
runs:
43-
using: 'composite'
43+
using: "composite"
4444
steps:
4545
- name: Validate inputs
4646
if: ${{ ! (inputs.task == 'containerize' || inputs.task == 'run' )}}
@@ -57,8 +57,10 @@ runs:
5757
echo "Error: This action currently supports Apptainer installation only on Ubuntu runners"
5858
exit 1
5959
fi
60+
sudo add-apt-repository -y ppa:apptainer/ppa
6061
sudo apt-get update
6162
sudo apt-get install -y apptainer
63+
6264
- name: Prepare .snakemake.environment.yaml
6365
shell: bash -el {0}
6466
run: |
@@ -104,4 +106,3 @@ runs:
104106
if: ${{ inputs.task == 'containerize' }}
105107
shell: bash -el {0}
106108
run: snakemake --directory ${{ inputs.directory }} --snakefile ${{ inputs.snakefile }} --show-failed-logs ${{ inputs.args }} --containerize > Dockerfile
107-

0 commit comments

Comments
 (0)