diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9407f42..c211b64 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,6 @@ on: jobs: build: - if: "!contains(github.event.head_commit.message, '[ci skip]')" runs-on: ubuntu-latest strategy: diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d7bb34..e3cd87a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # GRAPE-nf Changelog +## Version 1.1.0 + +- Fix issue with `sambamba` repo checkout in Dockerfile +- Change quantification process view - #59 +- Add output files section in readme - #58 +- Switch CI to GitHub Actions + + ## Version 1.0.0 First IHEC release diff --git a/docker/tool/sambamba/Dockerfile b/docker/tool/sambamba/Dockerfile index b5530b1..70598cc 100644 --- a/docker/tool/sambamba/Dockerfile +++ b/docker/tool/sambamba/Dockerfile @@ -18,9 +18,8 @@ RUN apk --no-cache add -X http://dl-cdn.alpinelinux.org/alpine/edge/main \ ARG REVISION=v0.7.1 -RUN git clone --recursive https://github.com/biod/sambamba.git && \ - cd sambamba && git checkout $REVISION && \ - make static +RUN git clone --recursive https://github.com/biod/sambamba.git --branch $REVISION \ + && cd sambamba && make static FROM grapenf/base diff --git a/docker/tool/sambamba/Dockerfile.compile b/docker/tool/sambamba/Dockerfile.compile index cbfd09d..4fc6d1c 100644 --- a/docker/tool/sambamba/Dockerfile.compile +++ b/docker/tool/sambamba/Dockerfile.compile @@ -25,9 +25,8 @@ ENV \ ARG REVISION=v0.7.1 -RUN git clone --recursive https://github.com/biod/sambamba.git && \ - cd sambamba && git checkout $REVISION && \ - make +RUN git clone --recursive https://github.com/biod/sambamba.git --branch $REVISION \ + && cd sambamba && make FROM grapenf/base