-
Notifications
You must be signed in to change notification settings - Fork 716
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
Add CI to build mulled containers with Wave #4080
Open
edmundmiller
wants to merge
84
commits into
master
Choose a base branch
from
wave
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+158
−10
Open
Changes from all commits
Commits
Show all changes
84 commits
Select commit
Hold shift + click to select a range
1c7c4b9
build: Add wave
edmundmiller 112c9e6
build: Set strategy to dockerfile, conda then container
edmundmiller 9d61b64
refactor: Remove container
edmundmiller cf3aa94
build: Add a repo to push to
edmundmiller 73d6d6f
ci(wave): Add wave build
edmundmiller 83f1e30
ci(wave): Switch to all_changed_files
edmundmiller 95d0069
ci(wave): Only look for envronment.ymls
edmundmiller 649214d
dummy: Change env
edmundmiller a4f4611
ci(wave): Remove raw format
edmundmiller aa02e1b
ci(wave): Try a bunch of different things at once
edmundmiller b37919c
ci(wave): Remove redundant fromJson and wrap in an array
edmundmiller 42e9f9e
ci(wave): I have no idea what I'm doing
edmundmiller abdbc57
ci(wave): Wrap it
edmundmiller 06188dd
ci(wave): Found an example
edmundmiller 72275d6
ci(wave): Maybe quotes?
edmundmiller bd0bdb0
ci(wave): That'll do it
edmundmiller 8333d50
ci(wave): Fix wave install
edmundmiller 95ec7e4
ci(wave): Hard code an image
edmundmiller f20da94
ci(wave): Add secrets
edmundmiller 4fe3bbd
feat: Try a different files structure
edmundmiller 7f84d8a
ci(wave): First stab at building singularity images
edmundmiller c80e959
fixup! feat: Try a different files structure
edmundmiller 15b163d
ci(wave): Add profile to matrix
edmundmiller a08373d
ci(wave): Give up on fancy substitution
edmundmiller 960702f
ci(wave): Add await
edmundmiller 9a3f93e
ci(wave): Switch to quay
edmundmiller 4c92894
test(wave): Add freeze and update build repo
edmundmiller 1cd2efe
refactor(wave): What happens if I add a container?
edmundmiller 6386a76
refactor(wave): Have both bowtie modules use the same env
edmundmiller 8aec35d
test: Cut out using wave on tests
edmundmiller 5a8fcc9
refactor: What happens if we use the singularity one?
edmundmiller 9b8ddfd
refactor: Keep container directives for offline download
edmundmiller 7b12cd7
feat: Try new singularity OCI setting
edmundmiller cac8b9f
build: Update container name
edmundmiller 75464b3
chore: Bump wave-cli version
edmundmiller f588f18
ci: Install runc
edmundmiller f4144ac
ci: Switch to singularityhub action
edmundmiller 8ea536e
ci: Install new singularity manually
edmundmiller d6437f8
ci: Install dependancies for singularity
edmundmiller 265abdf
ci: runc => crun
edmundmiller 00313f3
ci: Fix cgroup error
edmundmiller 04dd852
ci: That'll do it
edmundmiller 1127407
ci: Remove Dockerfile
edmundmiller 7b241f1
ci: Update name
edmundmiller 2c3a787
ci: Push to the correct repos
edmundmiller 895c72f
ci: Remove OCI stuff
edmundmiller 34852d9
ci: Need a full URL
edmundmiller 154fdda
ci: Fix // in container name
edmundmiller f3276d1
ci: Remove push
edmundmiller 66ebb14
build: Add containers back
edmundmiller 3394c98
ci: Add cache repos
edmundmiller cfc8528
ci: Change registry name to use _
edmundmiller c20dad0
build: / => _ in container name
edmundmiller 7b0b40b
Try ociAutoPull
edmundmiller b3488fb
chore: Add renovate comments to samtools
edmundmiller 5a3d546
test: Add ociAutoPull to nf-test
edmundmiller a3753e7
ci: Bump wave version
edmundmiller 0546a88
chore: Bump containers with new wave version
edmundmiller 8995941
build: Update to use commity.wave.seqera.io
edmundmiller 08292ea
ci: Bump wave-cli to 1.4.1
edmundmiller bc4a8bc
ci: Try apptainer
edmundmiller 300502d
ci: Remove build-repo to see what happens
edmundmiller 69e1ea5
build: Bump Nextflow version requirement
edmundmiller 14aa295
fix: Get rid of the environment name?
edmundmiller ca5d48a
ci: Bump action versions
edmundmiller 4353d08
ci: Try name-strategy tagPrefix
edmundmiller b36b631
ci: Remove singularity build for now
edmundmiller d0d8315
ci: Try imageSuffix
edmundmiller 2112a96
ci: Try none
edmundmiller 5ef863f
ci: What is the bowtie container name
edmundmiller ec74401
ci: Remove --name-strategy
edmundmiller 364f7a6
style: Add back in container elvis operator
edmundmiller a1e54b4
ci: Remove cache repo
edmundmiller 8fa7b0d
Revert "build: Bump Nextflow version requirement"
edmundmiller 727dda0
Revert "test: Add ociAutoPull to nf-test"
edmundmiller daa44fe
test(#6505): Snapshot the versions contents, not the hash
edmundmiller 457bf9e
ci(#6505): Update version snapshot after building containers
edmundmiller 2925c17
test(#6505): Attempt a topic channel with tests
edmundmiller 455bc2d
Merge remote-tracking branch 'origin/master' into wave
edmundmiller 2462a11
chore: Bump to 1.5.0
edmundmiller 6934f0b
fix: Remove shard and filter on test bumping
edmundmiller 3fa2c06
build: Bump images to match environment
edmundmiller 8c73e71
ci: Fix nf-test setup
edmundmiller 24de614
ci: Remove snapshot bumping
edmundmiller File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,138 @@ | ||
name: Wave | ||
# When environment.yml is changed | ||
on: | ||
pull_request: | ||
paths: | ||
- "**/environment.yml" | ||
|
||
# TODO On complete call testing CI | ||
# TODO Skip testing CI if any changes to environment.yml | ||
|
||
env: | ||
WAVE_VER: "1.5.0" | ||
NFTEST_VER: "0.9.1" | ||
|
||
jobs: | ||
gen-matrix: | ||
name: generate-matrix | ||
runs-on: ubuntu-latest | ||
|
||
steps: | ||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 | ||
|
||
- name: Calculate file differences | ||
id: diff | ||
uses: tj-actions/changed-files@v44 | ||
with: | ||
json: true | ||
quotepath: false | ||
# TODO Add Dockerfiles | ||
files: | | ||
modules/**/environment.yml | ||
- name: Debug | ||
run: echo ${{ steps.diff.outputs.all_changed_files }} | ||
- id: set-matrix | ||
run: echo "matrix={\"profile\":[\"docker\", \"singularity\"],\"files\":${{ steps.diff.outputs.all_changed_files }} }" >> "$GITHUB_OUTPUT" | ||
|
||
outputs: | ||
matrix: ${{ steps.set-matrix.outputs.matrix }} | ||
|
||
build: | ||
if: "${{ fromJson(needs.gen-matrix.outputs.matrix) }}" | ||
needs: gen-matrix | ||
name: build | ||
runs-on: ubuntu-latest | ||
timeout-minutes: 60 | ||
strategy: | ||
fail-fast: false | ||
matrix: "${{ fromJson(needs.gen-matrix.outputs.matrix) }}" | ||
steps: | ||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 | ||
|
||
- name: Install wave-cli | ||
run: | | ||
wget -q https://github.com/seqeralabs/wave-cli/releases/download/v${WAVE_VER}/wave-${WAVE_VER}-linux-x86_64 | ||
sudo mv wave-${WAVE_VER}-linux-x86_64 /usr/local/bin/wave | ||
chmod +x /usr/local/bin/wave | ||
|
||
- name: Create a registry name | ||
uses: actions/github-script@v7 | ||
id: registry-name | ||
with: | ||
result-encoding: string | ||
script: | | ||
return '${{ matrix.files }}'.replace('modules/nf-core/', '').replace('/environment.yml', '').replace('/', '_'); | ||
|
||
- name: Build container | ||
if: matrix.profile == 'docker' | ||
run: | | ||
wave --conda-file "${{ matrix.files }}" \ | ||
--freeze \ | ||
--await \ | ||
--tower-token ${{ secrets.TOWER_ACCESS_TOKEN }} \ | ||
--tower-workspace-id ${{ secrets.TOWER_WORKSPACE_ID }} | ||
|
||
- name: Build Singularity | ||
if: matrix.profile == 'singularity' | ||
run: | | ||
wave --conda-file "${{ matrix.files }}" \ | ||
--freeze \ | ||
--await \ | ||
--tower-token ${{ secrets.TOWER_ACCESS_TOKEN }} \ | ||
--tower-workspace-id ${{ secrets.TOWER_WORKSPACE_ID }} \ | ||
--singularity | ||
|
||
# TODO Build from Dockerfiles | ||
|
||
# bump-versions: | ||
# needs: gen-matrix | ||
# name: bump-versions | ||
# runs-on: ubuntu-latest | ||
# steps: | ||
# - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4 | ||
# with: | ||
# distribution: "temurin" | ||
# java-version: "17" | ||
|
||
# - uses: nf-core/setup-nextflow@v2 | ||
|
||
# - uses: nf-core/setup-nf-test@v1 | ||
# with: | ||
# version: ${{ env.NFTEST_VER }} | ||
|
||
# - name: Bump Snapshot Versions | ||
# env: | ||
# # NFT_DIFF: "pdiff" | ||
# # NFT_DIFF_ARGS: "--line-numbers --width 120 --expand-tabs=2" | ||
# SENTIEON_LICSRVR_IP: ${{ secrets.SENTIEON_LICSRVR_IP }} | ||
# SENTIEON_AUTH_MECH: "GitHub Actions - token" | ||
# run: | | ||
# # use "docker_self_hosted" if it runs on self-hosted runner and matrix.profile=docker | ||
# if [ "${{ matrix.profile }}" == "docker" ]; then | ||
# PROFILE="docker_self_hosted" | ||
# else | ||
# PROFILE=${{ matrix.profile }} | ||
# fi | ||
|
||
# NFT_WORKDIR=~ \ | ||
# nf-test test \ | ||
# --profile=${{ matrix.profile }} \ | ||
# --tap=test.tap \ | ||
# # --ci \ | ||
# --verbose \ | ||
# --only-changed \ | ||
# # --shard ${{ matrix.shard }}/${{ env.TOTAL_SHARDS }} \ | ||
# # --filter ${{ matrix.filter }} \ | ||
# --follow-dependencies \ | ||
# --tag version \ | ||
# --update-snapshot | ||
|
||
# - name: Commit & push version bumps | ||
# run: | | ||
# git config user.email "[email protected]" | ||
# git config user.name "nf-core-bot" | ||
# git config push.default upstream | ||
# git add . | ||
# git status | ||
# git commit -m "[automated] Bump versions snapshot" | ||
# git push |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,9 +3,10 @@ process BOWTIE_ALIGN { | |
label 'process_high' | ||
|
||
conda "${moduleDir}/environment.yml" | ||
container "" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Accidental? |
||
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? | ||
'https://depot.galaxyproject.org/singularity/mulled-v2-ffbf83a6b0ab6ec567a336cf349b80637135bca3:c84c7c55c45af231883d9ff4fe706ac44c479c36-0' : | ||
'biocontainers/mulled-v2-ffbf83a6b0ab6ec567a336cf349b80637135bca3:c84c7c55c45af231883d9ff4fe706ac44c479c36-0' }" | ||
'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/c8/c8c0819a9b1f520c49c933e667ae50de2a0730ece4c8b9efe79ac5e403963a9f/data' : | ||
'community.wave.seqera.io/library/bowtie_samtools:e1a14e1ce4e0170d' }" | ||
|
||
input: | ||
tuple val(meta), path(reads) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is to have
name
in the conda environment, right? We can remove if so.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, this was to have a different wave repo per module. We can keep this for anything built by a Dockerfile for now(bclconvert, cellranger, etc.)