From a572868b8f93c1851650ab9232475c1f610e2e9f Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Wed, 24 Jun 2020 17:11:20 +0100 Subject: [PATCH] Replace ansible in venv with system managed version This makes keeping updated on versions much easier! --- .github/workflows/lint.yml | 2 ++ dev-requirements.txt | 1 - requirements.txt | 1 - scripts/setup.sh | 2 +- tasks/dev.yml | 1 + 5 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 requirements.txt diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 75af32b..a7e0acf 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -11,6 +11,8 @@ jobs: uses: actions/setup-python@v1 with: python-version: 3.7 + - name: Install ansible + run: sudo apt-get update && sudo apt-get install -y ansible - name: Install dependencies run: ./scripts/setup.sh - name: Run linters diff --git a/dev-requirements.txt b/dev-requirements.txt index 3ad6ea0..aca7a97 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,3 +1,2 @@ --r requirements.txt yamllint==1.23.0 ansible-lint==4.2.0 diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index e47aa41..0000000 --- a/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -ansible==2.9.7 diff --git a/scripts/setup.sh b/scripts/setup.sh index de102a8..9eca8c5 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -6,4 +6,4 @@ python -m venv env env/bin/pip install -r dev-requirements.txt -env/bin/ansible-galaxy install -r galaxy-requirements.yml +ansible-galaxy install -r galaxy-requirements.yml diff --git a/tasks/dev.yml b/tasks/dev.yml index d6d282d..8cc5b51 100644 --- a/tasks/dev.yml +++ b/tasks/dev.yml @@ -14,6 +14,7 @@ become: true become_user: aur_builder loop: + - ansible - arduino - arduino-cli - arduino-builder