Skip to content

Commit aac24e2

Browse files
committed
fix: Make paths compatible with both GitHub-hosted and self-hosted runners
1 parent d790d79 commit aac24e2

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

.github/actions/gh-cache/cache/action.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@ runs:
2828
working-directory: ${{ github.action_path }}
2929
shell: bash
3030
run: |
31-
mkdir -p /home/runner/work/_actions/current/.github/actions
32-
rsync -a ../../../../.github/actions/ /home/runner/work/_actions/current/.github/actions/
33-
ls -ltra /home/runner/work/_actions/current/.github/actions
31+
RUNNER_WORK_DIR="$(realpath ${GITHUB_WORKSPACE}/../..)"
32+
ACTION_DIR="${RUNNER_WORK_DIR}/_actions/github/accessibility-scanner/current"
33+
mkdir -p ${ACTION_DIR}/.github/actions
34+
rsync -a ../../../../.github/actions/ ${ACTION_DIR}/.github/actions/
3435
- name: Restore cached value
35-
uses: ./../../_actions/current/.github/actions/gh-cache/restore
36+
uses: ./../../_actions/github/accessibility-scanner/current/.github/actions/gh-cache/restore
3637
with:
3738
path: ${{ inputs.key }}
3839
token: ${{ inputs.token }}
@@ -48,7 +49,7 @@ runs:
4849
4950
- if: ${{ inputs.value }}
5051
name: Save cached value
51-
uses: ./../../_actions/current/.github/actions/gh-cache/save
52+
uses: ./../../_actions/github/accessibility-scanner/current/.github/actions/gh-cache/save
5253
with:
5354
path: ${{ inputs.key }}
5455
token: ${{ inputs.token }}

action.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,13 @@ runs:
4444
working-directory: ${{ github.action_path }}
4545
shell: bash
4646
run: |
47-
mkdir -p /home/runner/work/_actions/current/.github/actions
48-
rsync -a .github/actions/ /home/runner/work/_actions/current/.github/actions/
49-
ls -ltra /home/runner/work/_actions/current/.github/actions
47+
RUNNER_WORK_DIR="$(realpath ${GITHUB_WORKSPACE}/../..)"
48+
ACTION_DIR="${RUNNER_WORK_DIR}/_actions/github/accessibility-scanner/current"
49+
mkdir -p ${ACTION_DIR}/.github/actions
50+
rsync -a .github/actions/ ${ACTION_DIR}/.github/actions/
5051
- name: Restore cached results
5152
id: restore
52-
uses: ./../../_actions/current/.github/actions/gh-cache/cache
53+
uses: ./../../_actions/github/accessibility-scanner/current/.github/actions/gh-cache/cache
5354
with:
5455
key: ${{ inputs.cache_key }}
5556
token: ${{ inputs.token }}
@@ -66,20 +67,20 @@ runs:
6667
- if: ${{ inputs.login_url && inputs.username && inputs.password && !inputs.auth_context }}
6768
name: Authenticate
6869
id: auth
69-
uses: ./../../_actions/current/.github/actions/auth
70+
uses: ./../../_actions/github/accessibility-scanner/current/.github/actions/auth
7071
with:
7172
login_url: ${{ inputs.login_url }}
7273
username: ${{ inputs.username }}
7374
password: ${{ inputs.password }}
7475
- name: Find
7576
id: find
76-
uses: ./../../_actions/current/.github/actions/find
77+
uses: ./../../_actions/github/accessibility-scanner/current/.github/actions/find
7778
with:
7879
urls: ${{ inputs.urls }}
7980
auth_context: ${{ inputs.auth_context || steps.auth.outputs.auth_context }}
8081
- name: File
8182
id: file
82-
uses: ./../../_actions/current/.github/actions/file
83+
uses: ./../../_actions/github/accessibility-scanner/current/.github/actions/file
8384
with:
8485
findings: ${{ steps.find.outputs.findings }}
8586
repository: ${{ inputs.repository }}
@@ -96,7 +97,7 @@ runs:
9697
- if: ${{ inputs.skip_copilot_assignment != 'true' }}
9798
name: Fix
9899
id: fix
99-
uses: ./../../_actions/current/.github/actions/fix
100+
uses: ./../../_actions/github/accessibility-scanner/current/.github/actions/fix
100101
with:
101102
issues: ${{ steps.get_issues_from_filings.outputs.issues }}
102103
repository: ${{ inputs.repository }}
@@ -126,7 +127,7 @@ runs:
126127
FILINGS: ${{ steps.file.outputs.filings }}
127128
FIXINGS: ${{ steps.fix.outputs.fixings }}
128129
- name: Save cached results
129-
uses: ./../../_actions/current/.github/actions/gh-cache/cache
130+
uses: ./../../_actions/github/accessibility-scanner/current/.github/actions/gh-cache/cache
130131
with:
131132
key: ${{ inputs.cache_key }}
132133
value: ${{ steps.results.outputs.results }}

0 commit comments

Comments
 (0)