From 026077a5f8dc215c1c8ec1a6f7a90a83021b17dc Mon Sep 17 00:00:00 2001
From: Sebastian Wiesner <sebastian@swsnr.de>
Date: Sat, 7 Sep 2019 11:43:14 +0200
Subject: Setup python properly for ansi2html

---
 .github/workflows/ci.yml | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a60d566..aa81792 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,16 +42,23 @@ jobs:
         - target: x86_64-unknown-linux-musl
           flags: --no-default-features --features terminology
     steps:
-    - uses: hecrj/setup-rust-action@v1
+    # Install ansi2html for tests
+    - uses: actions/setup-python@v1
       with:
-        rust-version: stable
-    - uses: actions/checkout@v1
+        python-version: '3.x'
+    - name: Install ansi2html for tests
+      run: pip install ansi2html
+    # Install musl tools for musl target
     - name: Install musl tools
       run: sudo apt-get install musl-tools
-    - name: Install ansi2html for tests
-      run: pip3 install ansi2html
+    # Setup rust version, and setup the target
+    - uses: hecrj/setup-rust-action@v1
+      with:
+        rust-version: stable
     - name: Setup target
       run: rustup target add ${{ matrix.build.target }}
+    # Test
+    - uses: actions/checkout@v1
     - name: Test
       run: cargo test --target ${{ matrix.build.target }} ${{ matrix.build.flags }}
     - name: Format sample
@@ -59,12 +66,18 @@ jobs:
   test_macos:
     runs-on: macOS-latest
     steps:
+    # Install ansi2html for tests
+    - uses: actions/setup-python@v1
+      with:
+        python-version: '3.x'
+    - name: Install ansi2html for tests
+      run: pip install ansi2html
+    # Setup rust version
     - uses: hecrj/setup-rust-action@v1
       with:
         rust-version: stable
+    # Test code
     - uses: actions/checkout@v1
-    - name: Install ansi2html for tests
-      run: pip3 install ansi2html
     - name: Test
       run: cargo test --no-default-features --features iterm2,remote_resources
     - name: Format sample
-- 
cgit v1.2.3