diff --git a/.github/workflows/ansible-test-deploy.yml b/.github/workflows/ansible-test-deploy.yml index f966cea..2310615 100644 --- a/.github/workflows/ansible-test-deploy.yml +++ b/.github/workflows/ansible-test-deploy.yml @@ -45,10 +45,12 @@ jobs: - uses: actions/checkout@v2 with: path: "ansible-role-sysmon" - - uses: msys2/setup-msys2@v2 + - uses: Vampire/setup-wsl@v1 with: - update: true - install: base-devel git gcc msys2-devel python3 python3-pip libffi libffi-devel libcrypt libcrypt-devel openssl openssl-devel + distribution: Ubuntu-22.04 + additional-packages: + python3 + python3-pip - name: Download ConfigureRemotingForAnsible.ps1 run: wget https://raw.githubusercontent.com/ansible/ansible/devel/examples/scripts/ConfigureRemotingForAnsible.ps1 -Outfile ConfigureRemotingForAnsible.ps1 shell: powershell @@ -63,13 +65,13 @@ jobs: Enable-LocalUser -Name "Ansible" shell: powershell - name: Update pip and setuptools - shell: msys2 {0} - run: CFLAGS=-I/usr/lib/libffi-3.2.1/include python -m pip install --upgrade pip setuptools + shell: wsl-bash {0} + run: python3 -m pip install --upgrade pip setuptools - name: Install Ansible - shell: msys2 {0} - run: CFLAGS=-I/usr/lib/libffi-3.2.1/include python -m pip install cryptography==3.3.2 wheel ansible pywinrm + shell: wsl-bash {0} + run: python3 -m pip install wheel setuptools-rust ansible pywinrm - name: Run Ansible playbook - shell: msys2 {0} + shell: wsl-bash {0} run: | ansible-playbook -i ansible-role-sysmon/.github/scripts/inventory ansible-role-sysmon/.github/scripts/playbook.yml - name: Run test script diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index d5d3211..a4a4d41 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -48,10 +48,12 @@ jobs: - uses: actions/checkout@v2 with: path: "ansible-role-sysmon" - - uses: msys2/setup-msys2@v2 + - uses: Vampire/setup-wsl@v1 with: - update: true - install: base-devel git gcc msys2-devel python3 python3-pip libffi libffi-devel libcrypt libcrypt-devel openssl openssl-devel + distribution: Ubuntu-22.04 + additional-packages: + python3 + python3-pip - name: Download ConfigureRemotingForAnsible.ps1 run: wget https://raw.githubusercontent.com/ansible/ansible/devel/examples/scripts/ConfigureRemotingForAnsible.ps1 -Outfile ConfigureRemotingForAnsible.ps1 shell: powershell @@ -65,14 +67,17 @@ jobs: Add-LocalGroupMember -Group Administrators -Member Ansible Enable-LocalUser -Name "Ansible" shell: powershell + - name: Echo $PATH + shell: wsl-bash {0} + run: echo $PATH - name: Update pip and setuptools - shell: msys2 {0} - run: CFLAGS=-I/usr/lib/libffi-3.2.1/include python -m pip install --upgrade pip setuptools + shell: wsl-bash {0} + run: python3 -m pip install --upgrade pip setuptools - name: Install Ansible - shell: msys2 {0} - run: CFLAGS=-I/usr/lib/libffi-3.2.1/include python -m pip install cryptography==3.3.2 wheel setuptools-rust ansible pywinrm + shell: wsl-bash {0} + run: python3 -m pip install wheel setuptools-rust ansible pywinrm - name: Run Ansible playbook - shell: msys2 {0} + shell: wsl-bash {0} run: | ansible-playbook -i ansible-role-sysmon/.github/scripts/inventory ansible-role-sysmon/.github/scripts/playbook.yml - name: Run test script