From 6d294e4d2fa0b67a232ddd800e32f61269862b88 Mon Sep 17 00:00:00 2001
From: Faustin Lammler <faustin@fala.red>
Date: Fri, 12 Jul 2024 13:15:18 +0200
Subject: [PATCH] Use Makefile for env setup

---
 .github/workflows/composite-action/action.yml | 3 +--
 .github/workflows/test_cluster.yml            | 4 +++-
 .github/workflows/test_cluster_mdbf.yml       | 4 +++-
 .github/workflows/test_default.yml            | 4 +++-
 .github/workflows/test_mdbf.yml               | 4 +++-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/composite-action/action.yml b/.github/workflows/composite-action/action.yml
index 604cfca..f9ea454 100644
--- a/.github/workflows/composite-action/action.yml
+++ b/.github/workflows/composite-action/action.yml
@@ -23,5 +23,4 @@ runs:
     - name: Install requirements
       shell: bash
       run: |
-        python3 -m pip install --upgrade pip
-        python3 -m pip install -r requirements.txt
+        make install
diff --git a/.github/workflows/test_cluster.yml b/.github/workflows/test_cluster.yml
index 3bac27b..bcdc3c2 100644
--- a/.github/workflows/test_cluster.yml
+++ b/.github/workflows/test_cluster.yml
@@ -51,7 +51,9 @@ jobs:
       - name: Setup environment
         uses: ./.github/workflows/composite-action
       - name: Run molecule
-        run: molecule test -s cluster
+        run: |
+          source .venv/bin/activate
+          molecule test -s cluster
         env:
           PY_COLORS: "1"
           ANSIBLE_FORCE_COLOR: "1"
diff --git a/.github/workflows/test_cluster_mdbf.yml b/.github/workflows/test_cluster_mdbf.yml
index 51993e4..853e9ca 100644
--- a/.github/workflows/test_cluster_mdbf.yml
+++ b/.github/workflows/test_cluster_mdbf.yml
@@ -57,7 +57,9 @@ jobs:
       - name: Setup environment
         uses: ./.github/workflows/composite-action
       - name: Run molecule
-        run: molecule test -s cluster
+        run: |
+          source .venv/bin/activate
+          molecule test -s cluster
         env:
           PY_COLORS: "1"
           ANSIBLE_FORCE_COLOR: "1"
diff --git a/.github/workflows/test_default.yml b/.github/workflows/test_default.yml
index 50a81ab..74fcbd1 100644
--- a/.github/workflows/test_default.yml
+++ b/.github/workflows/test_default.yml
@@ -55,7 +55,9 @@ jobs:
       - name: Setup environment
         uses: ./.github/workflows/composite-action
       - name: Run molecule
-        run: molecule test
+        run: |
+          source .venv/bin/activate
+          molecule test
         env:
           PY_COLORS: "1"
           ANSIBLE_FORCE_COLOR: "1"
diff --git a/.github/workflows/test_mdbf.yml b/.github/workflows/test_mdbf.yml
index 9be2293..f8f4d25 100644
--- a/.github/workflows/test_mdbf.yml
+++ b/.github/workflows/test_mdbf.yml
@@ -99,7 +99,9 @@ jobs:
       - name: Setup environment
         uses: ./.github/workflows/composite-action
       - name: Run molecule
-        run: molecule test
+        run: |
+          source .venv/bin/activate
+          molecule test
         env:
           PY_COLORS: "1"
           ANSIBLE_FORCE_COLOR: "1"