better cache key

This commit is contained in:
Merlin Jehli 2023-10-20 18:28:36 +02:00
parent 4f8afdb286
commit b81240a3a6
Signed by: FML128
GPG key ID: 76DE785F9DC31C59
2 changed files with 10 additions and 21 deletions

View file

@ -22,25 +22,10 @@ inputs:
runs: runs:
using: "composite" using: "composite"
steps: steps:
- name: Restore aur cache - name: Restore and build aur
id: cache-aur-restore uses: ./aur
uses: https://code.forgejo.org/actions/cache/restore@v3
with:
path: aur
key: ${{ runner.os }}-${{ github.repository }}-aur-${{ github.run_number }}
restore-keys: ${{ runner.os }}-${{ github.repository }}-aur-
- name: Build aur
if: steps.cache-aur-restore.outputs.cache-hit != 'true'
uses: https://git.fml128.ch/FML128/idkyet-builder-action/aur@main
with: with:
layer_config_file: layers_config.yml layer_config_file: layers_config.yml
- name: Save aur cache
if: steps.cache-aur-restore.outputs.cache-hit != 'true'
uses: actions/cache/save@v3
with:
path: aur
# key: ${{ steps.cache-primes-restore.outputs.cache-primary-key }} #TODO: implement this for better caching
key: ${{ runner.os }}-${{ github.repository }}-aur-${{ github.run_number }}
- name: Build images - name: Build images
uses: docker://git.fml128.ch/fml128/idkyet-builder:latest uses: docker://git.fml128.ch/fml128/idkyet-builder:latest
args: args:

View file

@ -10,13 +10,18 @@ inputs:
runs: runs:
using: "composite" using: "composite"
steps: steps:
- name: Get aur cache key
id: cache-aur-key
uses: docker://git.fml128.ch/fml128/idkyet-builder:latest
with:
args: aur_cache_key
- name: Restore aur cache - name: Restore aur cache
id: cache-aur-restore id: cache-aur-restore
uses: https://code.forgejo.org/actions/cache/restore@v3 uses: https://code.forgejo.org/actions/cache/restore@v3
with: with:
path: aur path: aur
key: ${{ runner.os }}-${{ github.repository }}-aur-${{ github.run_number }} key: aur-${{ steps.cache-aur-key.outputs.cache-aur-key }}
restore-keys: ${{ runner.os }}-${{ github.repository }}-aur- restore-keys: aur-
- name: Build aur - name: Build aur
if: steps.cache-aur-restore.outputs.cache-hit != 'true' if: steps.cache-aur-restore.outputs.cache-hit != 'true'
uses: docker://git.fml128.ch/fml128/idkyet-builder:latest uses: docker://git.fml128.ch/fml128/idkyet-builder:latest
@ -27,5 +32,4 @@ runs:
uses: actions/cache/save@v3 uses: actions/cache/save@v3
with: with:
path: aur path: aur
# key: ${{ steps.cache-primes-restore.outputs.cache-primary-key }} #TODO: implement this for better caching key: aur-${{ steps.cache-aur-key.outputs.cache-aur-key }}
key: ${{ runner.os }}-${{ github.repository }}-aur-${{ github.run_number }}