fixes

pd-rs · Jun 27, 2024 · 809a957 · 809a957
1 parent 7249897
commit 809a957
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -60,6 +60,7 @@ jobs:
       - name: inequality
         if: runner.os == 'Windows' && matrix.root-win-path != 'false'
         run: |
+          echo "root-win-path: ${{ matrix.root-win-path }}"
           echo "env: $PLAYDATE_SDK_PATH"
           [ "$PLAYDATE_SDK_PATH" == "${{ steps.installer.outputs.root }}" ] && (echo "::error ::Env is eq output: PLAYDATE_SDK_PATH" && exit 1)
 

diff --git a/action.yml b/action.yml
@@ -155,13 +155,22 @@ runs:
       id: output
       shell: bash
       run: |
-        echo "root=$PLAYDATE_SDK_PATH" >> $GITHUB_OUTPUT
         echo "version=$(cat $PLAYDATE_SDK_PATH/VERSION.txt)" >> $GITHUB_OUTPUT
-
-    - name: fix output
-      shell: bash
-      if: runner.os == 'Windows' && inputs.root-win-path != 'false'
-      run: |
-        PLAYDATE_SDK_PATH=$(cygpath -w "$PLAYDATE_SDK_PATH")
-        echo "fixed output path: $PLAYDATE_SDK_PATH"
+        # ${{ (runner.os == 'Windows' && inputs.root-win-path != 'false') && 'echo "root=$(cygpath -w "$PLAYDATE_SDK_PATH")" >> $GITHUB_OUTPUT' }}
+        if [ ${{ runner.os == 'Windows' }} ] && [ ${{ inputs.root-win-path }} ] then
+          PLAYDATE_SDK_PATH=$(cygpath -w "$PLAYDATE_SDK_PATH")
+          echo "fix root path"
+        else
+          # echo "root=$(cygpath -w '$PLAYDATE_SDK_PATH')" >> $GITHUB_OUTPUT
+        fi
         echo "root=$PLAYDATE_SDK_PATH" >> $GITHUB_OUTPUT
+        echo "set root to $PLAYDATE_SDK_PATH"
+
+
+    # - name: fix output
+    #   shell: bash
+    #   if: runner.os == 'Windows' && inputs.root-win-path != 'false'
+    #   run: |
+    #     PLAYDATE_SDK_PATH=$(cygpath -w "$PLAYDATE_SDK_PATH")
+    #     echo "fixed output path: $PLAYDATE_SDK_PATH"
+    #     echo "root=$PLAYDATE_SDK_PATH" >> $GITHUB_OUTPUT