Skip to content

Commit

Permalink
TST: CI
Browse files Browse the repository at this point in the history
  • Loading branch information
adamchengtkc committed Nov 22, 2023
1 parent 1ecdc5c commit 078c9a0
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 35 deletions.
3 changes: 0 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
FROM dolfinx/dolfinx:v0.6.0

LABEL org.opencontainers.image.source https://github.com/equinor/warmth
ARG DEBIAN_FRONTEND=noninteractive

RUN DEBIAN_FRONTEND=noninteractive \
&& apt-get update \
&& apt-get install -y build-essential --no-install-recommends make \
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/python-test-3d.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
type: string
jobs:
build:

environment: test3d
runs-on: ubuntu-latest

steps:
Expand All @@ -27,8 +27,6 @@ jobs:
image: ghcr.io/equinor/warmth:latest
name: dolfinx
options: -v ${{ github.workspace }}:/home/warmth
args: |
bash -c "cd /home/warmth" && pip install . pytest==7.4.2 pytest-cov==4.1.0 && pytest --cov-report=term-missing --cov=warmth tests | tee pytest-coverage.txt


- name: Comment coverage
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
with:
filters: |
mesh3d:
- 'warmth/3d/**'
- 'warmth/warmth3d/**'
- uses: equinor/warmth/.github/workflows/python-test-3d.yml@main
if: ${{ steps.filter3d.outputs.mesh3d }} == 'true'
with:
Expand Down
30 changes: 2 additions & 28 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,32 +1,6 @@
FROM dolfinx/dolfinx:v0.6.0

LABEL org.opencontainers.image.source https://github.com/equinor/warmth
ARG DEBIAN_FRONTEND=noninteractive
WORKDIR /home/warmth

RUN DEBIAN_FRONTEND=noninteractive \
&& apt-get update \
&& apt-get install -y build-essential --no-install-recommends make \
ca-certificates \
git \
libssl-dev \
zlib1g-dev \
libbz2-dev \
libreadline-dev \
libsqlite3-dev \
wget \
curl \
llvm \
libncurses5-dev \
xz-utils \
tk-dev \
libxml2-dev \
libxmlsec1-dev \
libffi-dev \
liblzma-dev

RUN useradd -rm -d /home/vscode -s /bin/bash -g root -G sudo -u 1000 vscode -p ""
USER vscode
WORKDIR /home/vscode
ENV HOME=/home/vscode
ENV PATH="/root/.local/bin:$HOME/.local/bin::$PATH"
RUN curl -sSL https://install.python-poetry.org | python3 -
ENTRYPOINT pip install . pytest==7.4.2 pytest-cov==4.1.0 && pytest --cov-report=term-missing --cov=warmth tests | tee pytest-coverage.txt

0 comments on commit 078c9a0

Please sign in to comment.