From 38d04137e0097dcea475dd52f9d8f12fc2a2b643 Mon Sep 17 00:00:00 2001
From: Lisanna Dettwyler <lisanna@galois.com>
Date: Wed, 5 May 2021 20:37:42 -0700
Subject: [PATCH] Fix RPC tests

---
 .github/workflows/ci.yml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4aac50396..41048ad82 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -228,6 +228,7 @@ jobs:
         run: |
           set -x
           chmod +x dist/bin/cryptol
+          chmod +x dist/bin/cryptol-remote-api
           chmod +x bin/test-runner
           .github/ci.sh install_system_deps
           ghc_ver="$(ghc --numeric-version)"
@@ -238,18 +239,14 @@ jobs:
         shell: bash
         continue-on-error: ${{ matrix.continue-on-error }}
         name: test-lib ${{ matrix.target }}
-        run: |
-          set -x
-          export PATH=$PWD/bin:$PWD/dist/bin:$PATH
-          ./bin/test-runner --ext=.icry -F -b --exe=dist/bin/cryptol ./tests/${{ matrix.target }}
+        env:
+          PATH: ${{ github.workspace }}/bin:${{ github.workspace }}/dist/bin:${{ env.PATH }}
+        run: ./bin/test-runner --ext=.icry -F -b --exe=dist/bin/cryptol ./tests/${{ matrix.target }}
 
       - if: matrix.suite == 'rpc'
         shell: bash
         continue-on-error: ${{ matrix.continue-on-error }}
-        run: |
-          set -x
-          export PATH=$PWD/bin:$PWD/dist/bin:$PATH
-          cryptol-remote-api/run_rpc_tests.sh
+        run: cryptol-remote-api/run_rpc_tests.sh
 
   build-push-image:
     runs-on: ubuntu-latest