iterating

blacklanternsecurity · Oct 21, 2024 · 97ce06b · 97ce06b
1 parent cc296b7
commit 97ce06b
Showing 1 changed file with 12 additions and 20 deletions.
diff --git a/.github/workflows/distro_tests.yml b/.github/workflows/distro_tests.yml
@@ -21,30 +21,22 @@ jobs:
         run: |
           if [ -f /etc/os-release ]; then
             . /etc/os-release
-            if [ "$ID" = "ubuntu" ]; then
-              if [ "$VERSION_ID" = "20.04" ]; then
-                # Add deadsnakes PPA for Python 3.12
-                apt-get update
-                apt-get install -y software-properties-common
-                add-apt-repository ppa:deadsnakes/ppa
-                apt-get update
-                apt-get install -y python3.12 python3.12-venv python3.12-distutils python3-pip
-                # Update alternatives to use python3.12
-                update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 1
-                update-alternatives --set python3 /usr/bin/python3.12
-              else
-                apt-get update
-                apt-get install -y python3 python3-pip python3-venv
-              fi
-              python3 -m pip install --upgrade pip
-              python3 -m pip install pipx
-            elif [ "$ID" = "debian" ]; then
+            if [ "$ID" = "ubuntu" || "$ID" = "debian" ]; then
+              # Add deadsnakes PPA for Python 3.12
+              apt-get update
+              apt-get install -y software-properties-common
+              add-apt-repository ppa:deadsnakes/ppa
               apt-get update
-              apt-get install -y python3 python3-pip python3-venv
+              apt-get install -y python3.12 python3.12-venv python3.12-distutils
+              # Install pip for Python 3.12
+              curl -sS https://bootstrap.pypa.io/get-pip.py | python3.12
+              # Update alternatives to use python3.12
+              update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 1
+              update-alternatives --set python3 /usr/bin/python3.12
               python3 -m pip install --upgrade pip
               python3 -m pip install pipx
             elif [ "$ID" = "alpine" ]; then
-              apk add --no-cache python3 py3-pip
+              apk add --no-cache bash python3 py3-pip
               python3 -m pip install --upgrade pip
               python3 -m pip install pipx
             elif [ "$ID" = "arch" ]; then