From 95212789e59cbc95860043423fb54a35ef5b78ed Mon Sep 17 00:00:00 2001
From: Thomas Lauf <thomas.lauf@tngtech.com>
Date: Fri, 22 Nov 2024 14:05:06 +0100
Subject: [PATCH] Improve E2E test workflow

- 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
---
 .github/workflows/tests.yaml      | 4 ++--
 test/docker/Dockerfile            | 3 +++
 test/docker/task-timew.dockerfile | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index aac9903..38b1fa0 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -50,7 +50,7 @@ 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 }}
@@ -58,7 +58,7 @@ jobs:
           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 }}
diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile
index 79e8907..e9e9edc 100644
--- a/test/docker/Dockerfile
+++ b/test/docker/Dockerfile
@@ -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"]
diff --git a/test/docker/task-timew.dockerfile b/test/docker/task-timew.dockerfile
index 623ebf1..0bf497b 100644
--- a/test/docker/task-timew.dockerfile
+++ b/test/docker/task-timew.dockerfile
@@ -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 )"
\ No newline at end of file