Skip to content

Commit c0a0a16

Browse files
author
Bence Szikszai
committed
Use workspace for temporary directory. Include directory hash in cache key.
1 parent 82a0240 commit c0a0a16

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

setup-poetry/action.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,27 @@ runs:
2727
- name: Set paths (Linux/Mac)
2828
if: runner.os != 'Windows'
2929
run: |
30-
echo "POETRY_BIN_DIR=$RUNNER_TEMP/poetry/bin" >> "$GITHUB_ENV"
31-
echo "POETRY_CONFIG_DIR=$RUNNER_TEMP/poetry/config" >> "$GITHUB_ENV"
32-
echo "POETRY_HOME=$RUNNER_TEMP/poetry/home" >> "$GITHUB_ENV"
33-
echo "POETRY_HOME_BIN=$RUNNER_TEMP/poetry/home/bin" >> "$GITHUB_ENV"
34-
echo "$RUNNER_TEMP/poetry/bin" >> "$GITHUB_PATH"
30+
echo "POETRY_BIN_DIR=$GITHUB_WORKSPACE/.cache/poetry/bin" >> "$GITHUB_ENV"
31+
echo "POETRY_CONFIG_DIR=$GITHUB_WORKSPACE/.cache/poetry/config" >> "$GITHUB_ENV"
32+
echo "POETRY_HOME=$GITHUB_WORKSPACE/.cache/poetry/home" >> "$GITHUB_ENV"
33+
echo "POETRY_HOME_BIN=$GITHUB_WORKSPACE/.cache/poetry/home/bin" >> "$GITHUB_ENV"
34+
echo "$GITHUB_WORKSPACE/.cache/poetry/bin" >> "$GITHUB_PATH"
3535
shell: bash
3636
- name: Set paths (Windows)
3737
if: runner.os == 'Windows'
3838
run: |
39-
Add-Content $env:GITHUB_ENV "POETRY_BIN_DIR=$env:RUNNER_TEMP\poetry\bin"
40-
Add-Content $env:GITHUB_ENV "POETRY_CONFIG_DIR=$env:RUNNER_TEMP\poetry\config"
41-
Add-Content $env:GITHUB_ENV "POETRY_HOME=$env:RUNNER_TEMP\poetry\home"
42-
Add-Content $env:GITHUB_ENV "POETRY_HOME_BIN=$env:RUNNER_TEMP\poetry\home\Scripts"
43-
Add-Content $env:GITHUB_PATH "$env:RUNNER_TEMP\poetry\bin"
39+
Add-Content $env:GITHUB_ENV "POETRY_BIN_DIR=$env:GITHUB_WORKSPACE\.cache\poetry\bin"
40+
Add-Content $env:GITHUB_ENV "POETRY_CONFIG_DIR=$env:GITHUB_WORKSPACE\.cache\poetry\config"
41+
Add-Content $env:GITHUB_ENV "POETRY_HOME=$env:GITHUB_WORKSPACE\.cache\poetry\home"
42+
Add-Content $env:GITHUB_ENV "POETRY_HOME_BIN=$env:GITHUB_WORKSPACE\.cache\poetry\home\Scripts"
43+
Add-Content $env:GITHUB_PATH "$env:GITHUB_WORKSPACE\.cache\poetry\bin"
4444
shell: pwsh
4545
- name: Copy paths from $GITHUB_ENV to $GITHUB_OUTPUT
4646
id: copy-paths
4747
run: |
4848
echo "poetry-bin-dir=$POETRY_BIN_DIR" >> "$GITHUB_OUTPUT"
4949
echo "poetry-home=$POETRY_HOME" >> "$GITHUB_OUTPUT"
50+
echo "poetry-hash=$(echo "$POETRY_BIN_DIR" | sha256sum | cut -d ' ' -f1)" >> $GITHUB_OUTPUT
5051
shell: bash
5152
- name: Cache poetry
5253
if: ${{ inputs.use-cache == 'true' }}
@@ -57,7 +58,7 @@ runs:
5758
path: |
5859
${{ steps.copy-paths.outputs.poetry-bin-dir }}/poetry*
5960
${{ steps.copy-paths.outputs.poetry-home }}
60-
key: poetry${{ inputs.poetry-version }}-${{ runner.os }}-py${{ env.pythonVersion }}
61+
key: poetry${{ inputs.poetry-version }}-${{ runner.os }}-py${{ env.pythonVersion }}-${{ steps.copy-paths.outputs.poetry-hash}}
6162
- name: Install Poetry
6263
if: steps.cache-poetry.outputs.cache-hit != 'true'
6364
run: |

0 commit comments

Comments
 (0)