From c1638e92a69c3ffb0bbd003203a8f1c2fcc95009 Mon Sep 17 00:00:00 2001
From: Jacob Bolda <me@jacobbolda.com>
Date: Wed, 19 Feb 2020 09:02:19 -0600
Subject: [PATCH] fix(tauri): make github action envs absolute for extra path
 level in runner.rs (#438)

* fix(tauri): extra path level in runner.rs

This file is one folder deeper than the other files which reference this env. This env is a relative folder reference so we need to concat an extra folder traversal into it.

* Revert "fix(tauri): extra path level in runner.rs"

This reverts commit eb1034b4f39513c036466ea62fa2fc551dd344a8.

* make envs in GH Actions absolute for now

* runner is only available within steps
---
 .github/workflows/check-on-push.yml | 7 ++++---
 .github/workflows/release-cargo.yml | 4 ++--
 .github/workflows/test-on-pr.yml    | 8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/check-on-push.yml b/.github/workflows/check-on-push.yml
index caccb7ec6..9218408eb 100644
--- a/.github/workflows/check-on-push.yml
+++ b/.github/workflows/check-on-push.yml
@@ -9,9 +9,7 @@ on:
 jobs:
   clippy_check:
     runs-on: ubuntu-latest
-    env:
-      TAURI_DIST_DIR: tauri/test/fixture/dist
-      TAURI_DIR: ../test/fixture/src-tauri
+
     steps:
       - uses: actions/checkout@v2
       - name: install webkit2gtk
@@ -22,3 +20,6 @@ jobs:
       - uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+        env:
+          TAURI_DIST_DIR: ${{ runner.workspace }}/tauri/tauri/test/fixture/dist
+          TAURI_DIR: ${{ runner.workspace }}/tauri/tauri/test/fixture/src-tauri
diff --git a/.github/workflows/release-cargo.yml b/.github/workflows/release-cargo.yml
index 0b709573a..c195bae3c 100644
--- a/.github/workflows/release-cargo.yml
+++ b/.github/workflows/release-cargo.yml
@@ -12,8 +12,8 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     env:
-      TAURI_DIST_DIR: tauri/test/fixture/dist
-      TAURI_DIR: ../test/fixture/src-tauri
+      TAURI_DIST_DIR: ${{ runner.workspace }}/tauri/tauri/test/fixture/dist
+      TAURI_DIR: ${{ runner.workspace }}/tauri/tauri/test/fixture/src-tauri
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/test-on-pr.yml b/.github/workflows/test-on-pr.yml
index 5144bbd02..1ecf839cf 100644
--- a/.github/workflows/test-on-pr.yml
+++ b/.github/workflows/test-on-pr.yml
@@ -27,14 +27,14 @@ jobs:
           cd ./tauri
           cargo build
         env:
-          TAURI_DIST_DIR: ../../test/fixture/dist
-          TAURI_DIR: ../test/fixture/src-tauri
+          TAURI_DIST_DIR: ${{ runner.workspace }}/tauri/tauri/test/fixture/dist
+          TAURI_DIR: ${{ runner.workspace }}/tauri/tauri/test/fixture/src-tauri
       - name: test
         run: |
           cargo test
         env:
-          TAURI_DIST_DIR: ../../test/fixture/dist
-          TAURI_DIR: ../test/fixture/src-tauri
+          TAURI_DIST_DIR: ${{ runner.workspace }}/tauri/tauri/test/fixture/dist
+          TAURI_DIR: ${{ runner.workspace }}/tauri/tauri/test/fixture/src-tauri
 
   build-tauri-bundler:
     runs-on: ${{ matrix.platform }}