From 44caec63c406135c7dab120647bc844ff553969e Mon Sep 17 00:00:00 2001 From: TSR Berry <20988865+TSRBerry@users.noreply.github.com> Date: Sun, 17 Sep 2023 12:40:35 +0200 Subject: [PATCH] Fix action_path references --- .github/actions/execute-command/action.yml | 8 +++++++- .github/actions/setup-mako/action.yml | 8 +++++++- action.yml | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/actions/execute-command/action.yml b/.github/actions/execute-command/action.yml index e02dfdd..6f8bd68 100644 --- a/.github/actions/execute-command/action.yml +++ b/.github/actions/execute-command/action.yml @@ -20,8 +20,14 @@ inputs: runs: using: 'composite' steps: + - name: Get Mako path + id: path + run: | + echo "mako=$(realpath '${{ github.action_path }}/../../../')" >> $GITHUB_OUTPUT + shell: bash + - run: | - poetry -n -C "${{ github.action_path }}" run ryujinx-mako ${{ inputs.command }} ${{ inputs.args }} + poetry -n -C "${{ steps.path.outputs.mako }}" run ryujinx-mako ${{ inputs.command }} ${{ inputs.args }} shell: bash env: MAKO_APP_ID: ${{ inputs.app_id }} diff --git a/.github/actions/setup-mako/action.yml b/.github/actions/setup-mako/action.yml index f1385b8..246e339 100644 --- a/.github/actions/setup-mako/action.yml +++ b/.github/actions/setup-mako/action.yml @@ -3,10 +3,16 @@ description: 'Setup the environment for Mako' runs: using: 'composite' steps: + - name: Get Mako path + id: path + run: | + echo "mako=$(realpath '${{ github.action_path }}/../../../')" >> $GITHUB_OUTPUT + shell: bash + - run: pipx install poetry shell: bash - run: | - cd "${{ github.action_path }}/../" + cd "${{ steps.path.outputs.mako }}" poetry install --only main shell: bash diff --git a/action.yml b/action.yml index 7aad421..1a51e15 100644 --- a/action.yml +++ b/action.yml @@ -29,11 +29,11 @@ runs: shell: bash - name: Setup Mako - if: steps.check_dest.outputs.exists == "false" + if: steps.check_dest.outputs.exists == 'false' uses: ./.github/actions/setup-mako - name: Create setup finished flag - if: steps.check_dest.outputs.exists == "false" + if: steps.check_dest.outputs.exists == 'false' run: touch "${{ github.action_path }}/.ryujinx-mako_setup-done" shell: bash