From 50877a033b28dc4643cec72ad136e6ec0feb1fa2 Mon Sep 17 00:00:00 2001 From: Jonas L Date: Sat, 18 Jun 2022 15:54:16 +0200 Subject: [PATCH] ci: fix python packages caching (#1893) --- .github/workflows/_python.yml | 8 +++++--- .github/workflows/api.yml | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/_python.yml b/.github/workflows/_python.yml index aebc344c9..3bc46c25f 100644 --- a/.github/workflows/_python.yml +++ b/.github/workflows/_python.yml @@ -57,7 +57,9 @@ jobs: - focal - jammy - container: ghcr.io/libretime/libretime-dev:${{ matrix.release }} + container: + image: ghcr.io/libretime/libretime-dev:${{ matrix.release }} + options: --user 1001 defaults: run: shell: bash @@ -68,9 +70,9 @@ jobs: - uses: actions/cache@v3 with: path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ inputs.context }}-${{ hashFiles(format('{0}/{1}', inputs.context, '**/setup.py')) }} + key: ${{ matrix.release }}-pip-${{ inputs.context }}-${{ hashFiles(format('{0}/{1}', inputs.context, '**/setup.py')) }} restore-keys: | - ${{ runner.os }}-pip-${{ inputs.context }} + ${{ matrix.release }}-pip-${{ inputs.context }} - name: Test run: make test diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml index b3f3f77c3..7f00ba0a9 100644 --- a/.github/workflows/api.yml +++ b/.github/workflows/api.yml @@ -46,7 +46,9 @@ jobs: --health-timeout 5s --health-retries 5 - container: ghcr.io/libretime/libretime-dev:${{ matrix.release }} + container: + image: ghcr.io/libretime/libretime-dev:${{ matrix.release }} + options: --user 1001 defaults: run: shell: bash @@ -59,9 +61,9 @@ jobs: - uses: actions/cache@v3 with: path: ~/.cache/pip - key: ${{ runner.os }}-pip-api-${{ hashFiles('api/**/setup.py') }} + key: ${{ matrix.release }}-pip-api-${{ hashFiles('api/**/setup.py') }} restore-keys: | - ${{ runner.os }}-pip-api + ${{ matrix.release }}-pip-api - name: Test run: make test