From f7e2adf79c985e4039b97d12026164e98f4490d5 Mon Sep 17 00:00:00 2001 From: mj-xmr <63722585+mj-xmr@users.noreply.github.com> Date: Fri, 27 May 2022 16:37:03 +0200 Subject: [PATCH 1/3] CI: Hash for net diff cache --- .github/workflows/linux.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index ddec9af..2c5c2a1 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -40,11 +40,12 @@ jobs: path: externals/tsqsim/build/data/data/txt key: data-${{ hashFiles('externals/tsqsim/data/data/txt/**/*') }} restore-keys: data-${{ hashFiles('externals/tsqsim/data/data/txt/**/*') }} + # Expendable, volatile & large cache - name: diff cache uses: actions/cache@v2 with: path: /tmp/diff_XMR.pkl - key: data-diff + key: data-diff-${{ hashFiles('/tmp/diff_XMR.pkl') }} restore-keys: data-diff # - name: deps cache # uses: actions/cache@v2 @@ -100,11 +101,12 @@ jobs: path: build/data/data/txt key: data-${{ hashFiles('build/data/data/txt/**/*') }} restore-keys: data-${{ hashFiles('build/data/data/txt/**/*') }} + # Expendable, volatile & large cache - name: diff cache uses: actions/cache@v2 with: path: /tmp/diff_XMR.pkl - key: data-diff + key: data-diff-${{ hashFiles('/tmp/diff_XMR.pkl') }} restore-keys: data-diff - name: prepare environment run: util/prep-env.sh From 9646e6aa088b8ea5d7e1ad1bb31cc09e8ad84e19 Mon Sep 17 00:00:00 2001 From: mj-xmr <63722585+mj-xmr@users.noreply.github.com> Date: Fri, 27 May 2022 16:46:52 +0200 Subject: [PATCH 2/3] Test hashfiles --- .github/workflows/linux.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 2c5c2a1..1fd1cdf 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -46,7 +46,9 @@ jobs: with: path: /tmp/diff_XMR.pkl key: data-diff-${{ hashFiles('/tmp/diff_XMR.pkl') }} - restore-keys: data-diff + restore-keys: | + data-diff-${{ hashFiles('/tmp/diff_XMR.pkl') }} + data-diff # - name: deps cache # uses: actions/cache@v2 # with: @@ -107,7 +109,9 @@ jobs: with: path: /tmp/diff_XMR.pkl key: data-diff-${{ hashFiles('/tmp/diff_XMR.pkl') }} - restore-keys: data-diff + restore-keys: | + data-diff-${{ hashFiles('/tmp/diff_XMR.pkl') }} + data-diff - name: prepare environment run: util/prep-env.sh - name: install dependencies From 6fcb6ff684d14c0c307d64cb2a00ac15378558dc Mon Sep 17 00:00:00 2001 From: mj-xmr <63722585+mj-xmr@users.noreply.github.com> Date: Fri, 27 May 2022 16:51:18 +0200 Subject: [PATCH 3/3] Test hashfiles --- .github/workflows/linux.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 1fd1cdf..6f136d6 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -45,9 +45,9 @@ jobs: uses: actions/cache@v2 with: path: /tmp/diff_XMR.pkl - key: data-diff-${{ hashFiles('/tmp/diff_XMR.pkl') }} + key: data-diff-${{ hashFiles('/tmp/diff_XMR.*') }} restore-keys: | - data-diff-${{ hashFiles('/tmp/diff_XMR.pkl') }} + data-diff-${{ hashFiles('/tmp/diff_XMR.*') }} data-diff # - name: deps cache # uses: actions/cache@v2 @@ -108,9 +108,9 @@ jobs: uses: actions/cache@v2 with: path: /tmp/diff_XMR.pkl - key: data-diff-${{ hashFiles('/tmp/diff_XMR.pkl') }} + key: data-diff-${{ hashFiles('/tmp/diff_XMR.*') }} restore-keys: | - data-diff-${{ hashFiles('/tmp/diff_XMR.pkl') }} + data-diff-${{ hashFiles('/tmp/diff_XMR.*') }} data-diff - name: prepare environment run: util/prep-env.sh