From 8674d5142059cc71fe20d724915104d84d674a2e Mon Sep 17 00:00:00 2001
From: ShahanaFarooqui <shahana.farooqui@gmail.com>
Date: Thu, 16 Jan 2025 22:19:09 -0800
Subject: [PATCH] ci: Fixes for failing workflows

- Updated the `gl-testing` Dockerfile to use Poetry `1.8.2`, as Poetry
`v2.x.x` installs the latest version of `pyln-grpc-proto` (`24.2.1`),
which causes the `mypy glclient` check to fail. Poetry `1.8.2` installs
`pyln-grpc-proto` version `0.1.3`, which works seamlessly with the CI.

- Added a check to ensure the group exists before adding it in the Docker.

- clnVersionManager: Locked Poetry version to `1.8.2` to allow for a
coordinated upgrade in the future.
---
 .github/workflows/cln-version-manager-py.yml | 21 +++++++-------------
 docker/gl-testing/Dockerfile                 | 12 +++++++----
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/cln-version-manager-py.yml b/.github/workflows/cln-version-manager-py.yml
index bcbe82a44..0dbbbb383 100644
--- a/.github/workflows/cln-version-manager-py.yml
+++ b/.github/workflows/cln-version-manager-py.yml
@@ -5,11 +5,11 @@ on:
     types:
       - synchronize
       - opened
-    workflow_dispatch:
-    merge_group:
-    push:
-      branches:
-        - master
+  workflow_dispatch:
+  merge_group:
+  push:
+    branches:
+      - master
 
 jobs:
   source:
@@ -41,18 +41,11 @@ jobs:
       - name: Install poetry
         if: steps.cached-poetry.outputs.cache-hit != 'true'
         uses: snok/install-poetry@v1
+        with:
+          version: 1.8.2
       - name: Install dependencies
         run: poetry update && poetry install --no-interaction
       - name: Run mypy
         run: poetry run mypy
       - name: Run tests
         run: poetry run pytest tests
-
-    
-
-      
-    
-
-          
-        
-
diff --git a/docker/gl-testing/Dockerfile b/docker/gl-testing/Dockerfile
index 1ff17b611..4802701d9 100644
--- a/docker/gl-testing/Dockerfile
+++ b/docker/gl-testing/Dockerfile
@@ -44,9 +44,11 @@ RUN python3 -m venv /tmp/venv
 # This ensures poetry is always up-to-date.
 # This approach also ensures `poetry` and our environment don't overlap
 ENV POETRY_HOME=/tmp/poetry
-RUN curl -sSL https://install.python-poetry.org | python3 -
+RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.2
 ENV PATH=$POETRY_HOME/bin:$PATH
-RUN poetry self add poetry-plugin-export
+
+# Uncomment below line after poetry v2.x.x upgrade
+# RUN poetry self add poetry-plugin-export
 
 # The pyproject.toml files describe our project
 # I purposefully ignore lock-files here
@@ -246,8 +248,10 @@ ENV VIRTUAL_ENV=/tmp/venv
 ARG GID=0
 ARG UID=0
 ARG DOCKER_USER=dev
-RUN groupadd -g $GID -o $DOCKER_USER &&\
-    useradd -m -u $UID -g $GID -G sudo -o -s /bin/bash $DOCKER_USER && \
+
+# Check if the group already exists before running groupadd
+RUN getent group $GID || groupadd -g $GID -o $DOCKER_USER && \
+    id -u $UID || useradd -m -u $UID -g $GID -G sudo -o -s /bin/bash $DOCKER_USER && \
     echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 
 # Create the required tmp-dicts