Skip to content

Commit

Permalink
fix caching
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexVCaron committed Sep 4, 2024
1 parent 95654c2 commit 8bb0b6d
Show file tree
Hide file tree
Showing 8 changed files with 54 additions and 90 deletions.
4 changes: 3 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
FROM scilus/scilus:2.0.2

ARG NFTEST_VERSION
ARG POETRY_VERSION

ENV NODE_MAJOR=18
ENV NFTEST_VERSION=${NFTEST_VERSION:-0.9.0-rc1}
ENV POETRY_VERSION=${POETRY_VERSION:-1.8.*}

RUN apt update && apt install -y \
curl \
Expand All @@ -14,7 +16,7 @@ RUN apt update && apt install -y \

RUN python3 -m pip install pipx && \
python3 -m pipx ensurepath && \
pipx install poetry
pipx install poetry==${POETRY_VERSION}

RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_MAJOR}.x | bash - &&\
apt-get install -y nodejs && \
Expand Down
3 changes: 2 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"NFTEST_VERSION": "0.9.0-rc1"
"NFTEST_VERSION": "0.9.0-rc1",
"POETRY_VERSION": "1.8.*"
}
},
"forwardPorts": [3000],
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ jobs:
type: "module"
component: ${{ matrix.module }}
nextflow_version: ${{ inputs.nextflow_version }}
nf_core_version: ${{ inputs.nf_core_version }}
secrets: inherit

lint-subworkflows:
Expand All @@ -146,7 +145,6 @@ jobs:
type: "subworkflow"
component: ${{ matrix.subworkflow }}
nextflow_version: ${{ inputs.nextflow_version }}
nf_core_version: ${{ inputs.nf_core_version }}
secrets: inherit

nf-test:
Expand Down
70 changes: 0 additions & 70 deletions .github/workflows/code_linting.yml

This file was deleted.

19 changes: 4 additions & 15 deletions .github/workflows/lint_module.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@ on:
required: false
type: string
default: "24.04.4"
nf_core_version:
description: "nf-core version to use"
required: false
type: string
default: "2.14.*"
workflow_call:
inputs:
component:
Expand All @@ -39,11 +34,6 @@ on:
required: false
type: string
default: "24.04.4"
nf_core_version:
description: "nf-core version to use"
required: false
type: string
default: "2.14.*"

run-name: Lint ${{ inputs.component }}
jobs:
Expand All @@ -57,6 +47,9 @@ jobs:
with:
python-version: "3.11"
cache: 'pip'
- uses: abatilo/actions-poetry@v2
with:
poetry-version: "1.8.*"
- uses: actions/setup-java@v4
with:
distribution: "temurin"
Expand All @@ -65,13 +58,9 @@ jobs:
- uses: nf-core/setup-nextflow@v2
with:
version: ${{ inputs.nextflow_version }}

- name: Upgrade pip
run: python -m pip install --upgrade pip

- name: Install nf-core tools
run: |
python -m pip install --upgrade --force-reinstall nf-core==${{ inputs.nf_core_version }}
poetry install --no-root
- name: Lint ${{ inputs.type }} ${{ inputs.component }}
env:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/publish_extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
with:
node-version: 20
cache: "npm"
cache-dependency-path: nf-scil-extensions/${{ inputs.name }}/package-lock.json

- name: npm clean install
working-directory: nf-scil-extensions/${{ inputs.name }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ run the following commands :
```bash
pip install pipx
pipx ensurepath
pipx install poetry
pipx install poetry==1.8.*
```

> [!NOTE]
Expand Down
43 changes: 43 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8bb0b6d

Please sign in to comment.