Skip to content

Commit

Permalink
Improve E2E test workflow
Browse files Browse the repository at this point in the history
- Print versions of Timewarrior and Taskwarrior at the end of combined image build
  Clarify what 'develop'/'stable' means in this image
- Rename action stages
  Clarify that this builds and runs the e2e test Docker image
  • Loading branch information
lauft committed Nov 22, 2024
1 parent 61d6a45 commit 9521278
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ jobs:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build ${{ matrix.name }}
- name: Build e2e on ${{ matrix.name }}
env:
REGISTRY: ghcr.io
OWNER: ${{ env.REPOSITORY }}
GITHUB_USER: ${{ github.repository_owner }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CONTAINER: ${{ matrix.container }}
run: docker compose build ${CONTAINER}
- name: Test ${{ matrix.name }}
- name: Run e2e on ${{ matrix.name }}
env:
REGISTRY: ghcr.io
OWNER: ${{ env.REPOSITORY }}
Expand Down
3 changes: 3 additions & 0 deletions test/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ RUN mkdir -p ~/.task/hooks
RUN cp on_modify.py ~/.task/hooks/on-modify.timewarrior
RUN chmod +x ~/.task/hooks/on-modify.timewarrior

RUN echo "timew: $( timew --version )" ; \
echo "task: $( task --version )"

# Run tests
ENV TASK_USE_PATH=true TIMEW_USE_PATH=true
CMD [ "bash", "-c", "/venv/bin/pytest /task-on-modify-hook/test/test_on-modify_e2e.py"]
4 changes: 4 additions & 0 deletions test/docker/task-timew.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,7 @@ COPY --from=timew /usr/local/bin/timew /usr/local/bin
# Initialize Timewarrior
WORKDIR /root/
RUN timew :yes

# Print version information
RUN echo "timew: $( timew --version )" ; \
echo "task: $( task --version )"

0 comments on commit 9521278

Please sign in to comment.