diff --git a/.gitea/workflows/ansible-deploy.yml b/.gitea/workflows/ansible-deploy.yml index 2368e0b..f7f2038 100644 --- a/.gitea/workflows/ansible-deploy.yml +++ b/.gitea/workflows/ansible-deploy.yml @@ -1,11 +1,7 @@ name: Ansible Deploy on: [push] jobs: - build: - uses: ./.gitea/workflows/ansible-install.yml - deploy: - needs: [ 'build' ] runs-on: ubuntu-latest env: RUNNER_TOOL_CACHE: /toolcache @@ -26,6 +22,26 @@ jobs: echo '${{secrets.SSH_PRIVATE_KEY}}' > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa + - uses: actions/checkout@v3 + with: + submodules: recursive + + - name: "Cache python packages" + uses: actions/cache@v3 + with: + path: ~/.cache/pip + key: ${{ runner.os }}-${{ env.ANSIBLE_VERSION }} + + - name: Install Ansible + run: | + apt update -y + apt install python3-pip -y + python3 -m pip install ansible==${{ env.ANSIBLE_VERSION }} + + #- name: Install Ansible Galaxy requirements + # run: | + # ansible-galaxy install -r requirements.yaml + - name: Run playbook uses: dawidd6/action-ansible-playbook@v2 with: diff --git a/.gitea/workflows/ansible-install.yml b/.gitea/workflows/ansible-install.yml deleted file mode 100644 index 1f78e34..0000000 --- a/.gitea/workflows/ansible-install.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Install Ansible using Pip - -on: - workflow_call: - -jobs: - build: - runs-on: ubuntu-latest - env: - RUNNER_TOOL_CACHE: /toolcache - ANSIBLE_VERSION: "8.7.0" - steps: - - name: Copy SSH Key - run: | - mkdir ~/.ssh/ - echo "Host *" > ~/.ssh/config - echo " StrictHostKeyChecking no" >> ~/.ssh/config - echo '${{secrets.SSH_PRIVATE_KEY}}' > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - - - uses: actions/checkout@v3 - with: - submodules: recursive - - - name: "Cache python packages" - uses: actions/cache@v3 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-${{ env.ANSIBLE_VERSION }} - - - name: Install Ansible - run: | - apt update -y - apt install python3-pip -y - python3 -m pip install ansible==${{ env.ANSIBLE_VERSION }} - - #- name: Install Ansible Galaxy requirements - # run: | - # ansible-galaxy install -r requirements.yaml \ No newline at end of file