From 526675eeb465a544b699dd89141158d1370eecb8 Mon Sep 17 00:00:00 2001 From: Jasper van Merle Date: Thu, 1 Jul 2021 00:39:41 +0200 Subject: [PATCH 1/5] Set up GitHub Actions caching --- .github/workflows/build.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ab460073..91b9c0d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,6 +15,16 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - name: Set up caching + uses: actions/cache@v2 + with: + path: ${{ env.pythonLocation }}/lib/python${{ matrix.python-version }}/site-packages + key: ${{ runner.os }}-site-packages-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('setup.py') }} + restore-keys: | + ${{ runner.os }}-site-packages-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}- + ${{ runner.os }}-site-packages-${{ matrix.python-version }}- + ${{ runner.os }}-site-packages- + - name: Set up Python uses: actions/setup-python@v2 with: @@ -41,6 +51,16 @@ jobs: with: python-version: 3.6 + - name: Set up caching + uses: actions/cache@v2 + with: + path: ${{ env.pythonLocation }}/lib/python${{ matrix.python-version }}/site-packages + key: ${{ runner.os }}-site-packages-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('setup.py') }} + restore-keys: | + ${{ runner.os }}-site-packages-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}- + ${{ runner.os }}-site-packages-${{ matrix.python-version }}- + ${{ runner.os }}-site-packages- + - name: Install dependencies run: pip install -r requirements.txt From dedbacf69c4db8d8b7c774889e1b2f60cf489fb4 Mon Sep 17 00:00:00 2001 From: Jasper van Merle Date: Thu, 1 Jul 2021 00:47:20 +0200 Subject: [PATCH 2/5] Update workflows --- .github/workflows/build.yml | 28 ++++++++++++------------ .github/workflows/regression-testing.yml | 10 +++++++++ 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 91b9c0d1..13081930 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,15 +15,15 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Set up caching + - name: Set up build cache uses: actions/cache@v2 with: - path: ${{ env.pythonLocation }}/lib/python${{ matrix.python-version }}/site-packages - key: ${{ runner.os }}-site-packages-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('setup.py') }} - restore-keys: | - ${{ runner.os }}-site-packages-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}- - ${{ runner.os }}-site-packages-${{ matrix.python-version }}- - ${{ runner.os }}-site-packages- + path: ${{ env.pythonLocation }}/lib/python${{ matrix.python-version }}/site-packages + key: ${{ runner.os }}-site-packages-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('setup.py') }} + restore-keys: | + ${{ runner.os }}-site-packages-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}- + ${{ runner.os }}-site-packages-${{ matrix.python-version }}- + ${{ runner.os }}-site-packages- - name: Set up Python uses: actions/setup-python@v2 @@ -51,15 +51,15 @@ jobs: with: python-version: 3.6 - - name: Set up caching + - name: Set up build cache uses: actions/cache@v2 with: - path: ${{ env.pythonLocation }}/lib/python${{ matrix.python-version }}/site-packages - key: ${{ runner.os }}-site-packages-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('setup.py') }} - restore-keys: | - ${{ runner.os }}-site-packages-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}- - ${{ runner.os }}-site-packages-${{ matrix.python-version }}- - ${{ runner.os }}-site-packages- + path: ${{ env.pythonLocation }}/lib/python${{ matrix.python-version }}/site-packages + key: ${{ runner.os }}-site-packages-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('setup.py') }} + restore-keys: | + ${{ runner.os }}-site-packages-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}- + ${{ runner.os }}-site-packages-${{ matrix.python-version }}- + ${{ runner.os }}-site-packages- - name: Install dependencies run: pip install -r requirements.txt diff --git a/.github/workflows/regression-testing.yml b/.github/workflows/regression-testing.yml index eddcbaa5..2b660ce3 100644 --- a/.github/workflows/regression-testing.yml +++ b/.github/workflows/regression-testing.yml @@ -23,6 +23,16 @@ jobs: with: python-version: ${{ matrix.python-version }} + - name: Set up build cache + uses: actions/cache@v2 + with: + path: ${{ env.pythonLocation }}/lib/python${{ matrix.python-version }}/site-packages + key: ${{ runner.os }}-site-packages-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('setup.py') }} + restore-keys: | + ${{ runner.os }}-site-packages-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}- + ${{ runner.os }}-site-packages-${{ matrix.python-version }}- + ${{ runner.os }}-site-packages- + - name: Install dependencies run: pip install -r requirements.txt From c1300ff9704704bb7dd04d9d942cfd0a7af28e1b Mon Sep 17 00:00:00 2001 From: Jasper van Merle Date: Mon, 5 Jul 2021 15:13:24 +0200 Subject: [PATCH 3/5] Remove restore keys --- .github/workflows/build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 13081930..b4be758d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,10 +20,6 @@ jobs: with: path: ${{ env.pythonLocation }}/lib/python${{ matrix.python-version }}/site-packages key: ${{ runner.os }}-site-packages-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('setup.py') }} - restore-keys: | - ${{ runner.os }}-site-packages-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}- - ${{ runner.os }}-site-packages-${{ matrix.python-version }}- - ${{ runner.os }}-site-packages- - name: Set up Python uses: actions/setup-python@v2 From 2c805aded7abb6044bccf4d6f4c684b332790d3a Mon Sep 17 00:00:00 2001 From: Jasper van Merle Date: Mon, 5 Jul 2021 15:15:55 +0200 Subject: [PATCH 4/5] Change cache name --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b4be758d..72d4cdfa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,8 +19,7 @@ jobs: uses: actions/cache@v2 with: path: ${{ env.pythonLocation }}/lib/python${{ matrix.python-version }}/site-packages - key: ${{ runner.os }}-site-packages-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('setup.py') }} - + key: ${{ runner.os }}-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('setup.py') }} - name: Set up Python uses: actions/setup-python@v2 with: From afdf1db11dd4f8a0a63fea74772992dfaf585e41 Mon Sep 17 00:00:00 2001 From: Jasper van Merle Date: Mon, 5 Jul 2021 15:22:56 +0200 Subject: [PATCH 5/5] Update release workflow --- .github/workflows/build.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 72d4cdfa..6e85c57c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,11 +50,7 @@ jobs: uses: actions/cache@v2 with: path: ${{ env.pythonLocation }}/lib/python${{ matrix.python-version }}/site-packages - key: ${{ runner.os }}-site-packages-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('setup.py') }} - restore-keys: | - ${{ runner.os }}-site-packages-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}- - ${{ runner.os }}-site-packages-${{ matrix.python-version }}- - ${{ runner.os }}-site-packages- + key: ${{ runner.os }}-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('setup.py') }} - name: Install dependencies run: pip install -r requirements.txt