Try a new approach

cdlib · Aug 30, 2024 · 7bf22c3 · 7bf22c3
1 parent 2a83799
commit 7bf22c3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/docker-matrix.yml b/.github/workflows/docker-matrix.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image-tag: ['3.12-slim-bullseye', '3.13.0rc1', '3.13.0rc1-slim', 'latest']
+        image-tag: ['latest']
         update-strategy: [locked-install, unlocked-install, latest-install]
 
     steps:

diff --git a/Dockerfile b/Dockerfile
@@ -17,9 +17,11 @@ FROM base AS poetry
 
 # Print environment information
 RUN echo "--------ENVIRONMENT OUTPUT--------" && \
-    grep -E '^ID=|^VERSION_ID=|^VERSION_CODENAME=' /etc/os-release | awk -F= '{print $1 ": " $2}' && \
-    echo -n "FULL VERSION: " && cat /etc/debian_version && \
-    echo -n "LANGUAGE VERSION: " && python --version && \
+    echo "ID: $(source /etc/os-release && echo $ID)" && \
+    echo "VERSION_ID: $(source /etc/os-release && echo $VERSION_ID)" && \
+    echo "VERSION_CODENAME: $(source /etc/os-release && echo $VERSION_CODENAME)" && \
+    echo "FULL VERSION: $(cat /etc/debian_version)" && \
+    echo "LANGUAGE VERSION: $(python --version 2>&1)" && \
     echo "--------ENVIRONMENT OUTPUT--------"
 
 

diff --git a/summary.py b/summary.py
@@ -41,12 +41,12 @@ def analyze_logs(log_content):
     python_version = None
     issues_found = False
 
-    # Refined patterns to capture actual output content
-    id_pattern = re.compile(r'^#\d+ \d+\.\d+ ID: (.+)')
-    version_id_pattern = re.compile(r'^#\d+ \d+\.\d+ VERSION_ID: "?(.+?)"?')
-    version_codename_pattern = re.compile(r'^#\d+ \d+\.\d+ VERSION_CODENAME: (.+)')
-    full_version_pattern = re.compile(r'^#\d+ \d+\.\d+ FULL VERSION: (.+)')
-    python_version_pattern = re.compile(r'^#\d+ \d+\.\d+ LANGUAGE VERSION: (.+)')
+    # Simple patterns to capture actual output content
+    id_pattern = re.compile(r'^ID: (.+)')
+    version_id_pattern = re.compile(r'^VERSION_ID: (.+)')
+    version_codename_pattern = re.compile(r'^VERSION_CODENAME: (.+)')
+    full_version_pattern = re.compile(r'^FULL VERSION: (.+)')
+    python_version_pattern = re.compile(r'^LANGUAGE VERSION: (.+)')
 
     # Patterns to capture possible errors
     error_patterns = [