Skip to content

Commit 24a712e

Browse files
authored
feat: support virtool-workflow^6.0.0-alpha10
* Use `virtool-workflow==6.0.0alpha10`. * Add `subtraction_read_ids.txt` to gitignore. * Overhaul tests and test data. * Improve Docker-based CI testing.
1 parent 2703f46 commit 24a712e

File tree

120 files changed

+938124
-1077239
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+938124
-1077239
lines changed

.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
.github
2+
subtracted_read_ids.txt
13
target

.github/workflows/ci.yml

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,38 +13,42 @@ jobs:
1313
runs-on: ubuntu-22.04
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717
with:
1818
fetch-depth: 0
1919
- name: commitlint
2020
uses: wagoid/commitlint-github-action@v5
21-
build:
22-
runs-on: ubuntu-22.04
23-
steps:
24-
- name: Checkout
25-
uses: actions/checkout@v3
26-
- name: Build
27-
run: docker build --target=base .
2821
test:
2922
runs-on: ubuntu-22.04
3023
steps:
3124
- name: Checkout
32-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
26+
- name: Setup Docker
27+
uses: docker/setup-buildx-action@v3
28+
- name: Build
29+
id: build
30+
uses: docker/build-push-action@v5
31+
with:
32+
cache-from: type=gha
33+
cache-to: type=gha,mode=max
34+
context: .
35+
load: true
36+
target: test
3337
- name: Test
34-
run: docker build --target=test .
38+
run: docker run --rm -t ${{ steps.build.outputs.imageid }} pytest
3539
release:
3640
runs-on: ubuntu-22.04
37-
needs: test
41+
needs: [commitlint, test]
3842
if: github.event_name == 'push'
3943
steps:
4044
- name: Checkout
41-
uses: actions/checkout@v3
45+
uses: actions/checkout@v4
4246
- name: Setup Node
43-
uses: actions/setup-node@v3
47+
uses: actions/setup-node@v4
4448
with:
45-
node-version: 18
49+
node-version: 20
4650
- name: Install semantic-release
47-
run: npm i semantic-release@v18.0.0 conventional-changelog-conventionalcommits@4.6.1
51+
run: npm i semantic-release@v23.0.0 conventional-changelog-conventionalcommits@7.0.2
4852
- name: Release
4953
env:
5054
GITHUB_USERNAME: ${{ secrets.GH_USERNAME }}

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.idea
33
.pytest_cache
44
.vscode
5-
__pycache__
65
*.pyc
6+
__pycache__
7+
subtracted_read_ids.txt
78
target

.pre-commit-config.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,15 @@ ENV PATH="/root/.cargo/bin:/root/.local/bin:${PATH}"
3030
RUN pip install --upgrade pip
3131
RUN pip install maturin==0.14.5
3232
COPY src src
33-
COPY Cargo.toml Cargo.lock fixtures.py pathoscope.py poetry.lock pyproject.toml workflow.py ./
33+
COPY Cargo.toml Cargo.lock fixtures.py utils.py poetry.lock pyproject.toml workflow.py ./
3434
RUN maturin build --release
3535
RUN poetry export > requirements.txt
3636
RUN pip install -r requirements.txt
3737
RUN pip install /app/target/wheels/rust_utils*.whl
3838

39-
4039
FROM base as test
4140
WORKDIR /app
42-
RUN poetry export --with dev > requirements.txt
41+
RUN poetry export --with dev > requirements.txt
4342
RUN pip install -r requirements.txt
43+
COPY example ./example
4444
COPY tests ./tests
45-
RUN pytest
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)