Merge pull request #14 from nf-core/dev

Fix workflow issues (except linting)
nf-core · Nov 16, 2020 · 3333acb · 3333acb
2 parents 07e0833 + 4b6de8b
commit 3333acb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/awsfulltest.yml b/.github/workflows/awsfulltest.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Miniconda
-        uses: goanpeca/setup-miniconda@v1.0.2
+        uses: conda-incubator/setup-miniconda@v2
         with:
           auto-update-conda: true
           python-version: 3.7

diff --git a/.github/workflows/awstest.yml b/.github/workflows/awstest.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Miniconda
-        uses: goanpeca/setup-miniconda@v1.0.2
+        uses: conda-incubator/setup-miniconda@v2
         with:
           auto-update-conda: true
           python-version: 3.7

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,9 +26,9 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Check if Dockerfile or Conda environment changed
-        uses: technote-space/get-diff-action@v1
+        uses: technote-space/get-diff-action@v4
         with:
-          PREFIX_FILTER: |
+          FILES: |
             Dockerfile
             environment.yml
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM nfcore/base:dev
+FROM nfcore/base:1.11
 LABEL authors="nf-core" \
       description="Docker image containing all software requirements for the nf-core/testpipeline pipeline"