From 6c3c021d084c59f3d36741d0d13b6378cbcf7e45 Mon Sep 17 00:00:00 2001 From: JackWilb Date: Fri, 21 Feb 2020 11:41:25 -0700 Subject: [PATCH 01/25] add yarn caching --- .github/workflows/main.yml | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c3613d75..029fef15 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,7 +35,17 @@ jobs: - uses: actions/setup-node@v1 with: node-version: '10.x' - - run: cd client && yarn install + + - uses: actions/cache@v1 + id: yarn-cache + with: + path: /home/runner/work/multinet/multinet/client/node_modules + key: ${{ runner.os }}-yarn-${{ hashFiles('/home/runner/work/multinet/multinet/client/yarn.lock') }}-0 + + - name: Install yarn packages + if: steps.yarn-cache.outputs.cache-hit != 'true' + run: cd client && yarn install + - run: cd client && yarn lint - run: cd client && yarn lint:test - run: pipenv run test-server-up @@ -44,7 +54,17 @@ jobs: - run: cd client && yarn build # Build and test Multinet client library. - - run: cd multinetjs && yarn install + - uses: actions/cache@v1 + id: yarn-cache + with: + path: /home/runner/work/multinet/multinet/multinetjs/node_modules + key: ${{ runner.os }}-yarn-${{ hashFiles('/home/runner/work/multinet/multinet/client/yarn.lock') }}-0 + + - name: Install yarn packages + if: steps.yarn-cache.outputs.cache-hit != 'true' + run: cd multinetjs && yarn install + - run: cd multinetjs && yarn build - run: cd multinetjs && yarn lint - run: cd multinetjs && yarn test + From 09688b68190843e0373a062304601ddb8ae2f12f Mon Sep 17 00:00:00 2001 From: JackWilb Date: Fri, 21 Feb 2020 11:43:18 -0700 Subject: [PATCH 02/25] Fix the filepath for yarn lock for the multinetjs repo --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 029fef15..3fa90919 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,7 +58,7 @@ jobs: id: yarn-cache with: path: /home/runner/work/multinet/multinet/multinetjs/node_modules - key: ${{ runner.os }}-yarn-${{ hashFiles('/home/runner/work/multinet/multinet/client/yarn.lock') }}-0 + key: ${{ runner.os }}-yarn-${{ hashFiles('/home/runner/work/multinet/multinet/multinetjs/yarn.lock') }}-0 - name: Install yarn packages if: steps.yarn-cache.outputs.cache-hit != 'true' From 9e13da170209e0555e6a75085e9a4df1ab5fbc0d Mon Sep 17 00:00:00 2001 From: JackWilb Date: Fri, 21 Feb 2020 11:44:12 -0700 Subject: [PATCH 03/25] Fix the ids --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3fa90919..a893890b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,13 +37,13 @@ jobs: node-version: '10.x' - uses: actions/cache@v1 - id: yarn-cache + id: client-cache with: path: /home/runner/work/multinet/multinet/client/node_modules key: ${{ runner.os }}-yarn-${{ hashFiles('/home/runner/work/multinet/multinet/client/yarn.lock') }}-0 - name: Install yarn packages - if: steps.yarn-cache.outputs.cache-hit != 'true' + if: steps.client-cache.outputs.cache-hit != 'true' run: cd client && yarn install - run: cd client && yarn lint @@ -55,13 +55,13 @@ jobs: # Build and test Multinet client library. - uses: actions/cache@v1 - id: yarn-cache + id: multinetjs-cache with: path: /home/runner/work/multinet/multinet/multinetjs/node_modules key: ${{ runner.os }}-yarn-${{ hashFiles('/home/runner/work/multinet/multinet/multinetjs/yarn.lock') }}-0 - name: Install yarn packages - if: steps.yarn-cache.outputs.cache-hit != 'true' + if: steps.multinetjs-cache.outputs.cache-hit != 'true' run: cd multinetjs && yarn install - run: cd multinetjs && yarn build From ddbad379396d70708957fcc7c9eabdaf27c855e8 Mon Sep 17 00:00:00 2001 From: JackWilb Date: Fri, 21 Feb 2020 11:50:04 -0700 Subject: [PATCH 04/25] update the whitespace to trigger a rebuild. Testing 2 caches --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a893890b..5aad0fec 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -67,4 +67,3 @@ jobs: - run: cd multinetjs && yarn build - run: cd multinetjs && yarn lint - run: cd multinetjs && yarn test - From e0ce06bf2db765f7ee850b4aa512337999495780 Mon Sep 17 00:00:00 2001 From: JackWilb Date: Fri, 21 Feb 2020 12:22:57 -0700 Subject: [PATCH 05/25] update the cache names to be more consistent --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5aad0fec..38c0d087 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,7 +40,7 @@ jobs: id: client-cache with: path: /home/runner/work/multinet/multinet/client/node_modules - key: ${{ runner.os }}-yarn-${{ hashFiles('/home/runner/work/multinet/multinet/client/yarn.lock') }}-0 + key: ${{ runner.os }}-yarn-${{ hashFiles('/home/runner/work/multinet/multinet/client/yarn.lock') }}-client-cache - name: Install yarn packages if: steps.client-cache.outputs.cache-hit != 'true' @@ -58,7 +58,7 @@ jobs: id: multinetjs-cache with: path: /home/runner/work/multinet/multinet/multinetjs/node_modules - key: ${{ runner.os }}-yarn-${{ hashFiles('/home/runner/work/multinet/multinet/multinetjs/yarn.lock') }}-0 + key: ${{ runner.os }}-yarn-${{ hashFiles('/home/runner/work/multinet/multinet/multinetjs/yarn.lock') }}-multinetjs-cache - name: Install yarn packages if: steps.multinetjs-cache.outputs.cache-hit != 'true' From e4c1ce3924cec20bcae9ff01f18db17930a3ec92 Mon Sep 17 00:00:00 2001 From: JackWilb97 Date: Fri, 21 Feb 2020 14:29:18 -0700 Subject: [PATCH 06/25] add a cache for pipenv site packages --- .github/workflows/main.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5aad0fec..7ecab261 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,7 +25,17 @@ jobs: # Build and test Multinet server. - run: pip install pipenv - - run: pipenv install --dev --deploy + + - uses: actions/cache@v1 + id: client-cache + with: + path: /home/runner/work/multinet/multinet/.venv/lib/python3.7/site-packages + key: ${{ runner.os }}-pipenv-${{ hashFiles('/home/runner/work/multinet/multinet/Pipfile.lock') }}-0 + + - name: Install yarn packages + if: steps.client-cache.outputs.cache-hit != 'true' + run: PIPENV_VENV_IN_PROJECT=1 pipenv install --dev --deploy + - run: pipenv run lint - run: pipenv run format - run: pipenv run typecheck @@ -40,7 +50,7 @@ jobs: id: client-cache with: path: /home/runner/work/multinet/multinet/client/node_modules - key: ${{ runner.os }}-yarn-${{ hashFiles('/home/runner/work/multinet/multinet/client/yarn.lock') }}-0 + key: ${{ runner.os }}-yarn-${{ hashFiles('/home/runner/work/multinet/multinet/client/yarn.lock') }}-client - name: Install yarn packages if: steps.client-cache.outputs.cache-hit != 'true' @@ -58,7 +68,7 @@ jobs: id: multinetjs-cache with: path: /home/runner/work/multinet/multinet/multinetjs/node_modules - key: ${{ runner.os }}-yarn-${{ hashFiles('/home/runner/work/multinet/multinet/multinetjs/yarn.lock') }}-0 + key: ${{ runner.os }}-yarn-${{ hashFiles('/home/runner/work/multinet/multinet/multinetjs/yarn.lock') }}-client - name: Install yarn packages if: steps.multinetjs-cache.outputs.cache-hit != 'true' @@ -67,3 +77,4 @@ jobs: - run: cd multinetjs && yarn build - run: cd multinetjs && yarn lint - run: cd multinetjs && yarn test + From 8e6d0e0a188951bc3741c4a328780d19c62ef8d4 Mon Sep 17 00:00:00 2001 From: JackWilb97 Date: Fri, 21 Feb 2020 14:30:35 -0700 Subject: [PATCH 07/25] update ids --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7ecab261..7752cf14 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,13 +27,13 @@ jobs: - run: pip install pipenv - uses: actions/cache@v1 - id: client-cache + id: multinet-cache with: path: /home/runner/work/multinet/multinet/.venv/lib/python3.7/site-packages key: ${{ runner.os }}-pipenv-${{ hashFiles('/home/runner/work/multinet/multinet/Pipfile.lock') }}-0 - name: Install yarn packages - if: steps.client-cache.outputs.cache-hit != 'true' + if: steps.multinet-cache.outputs.cache-hit != 'true' run: PIPENV_VENV_IN_PROJECT=1 pipenv install --dev --deploy - run: pipenv run lint From 1bb0bac488bb3e99b9c834cd7a549a8d168b0006 Mon Sep 17 00:00:00 2001 From: JackWilb97 Date: Fri, 21 Feb 2020 15:02:04 -0700 Subject: [PATCH 08/25] update the ignore for flake --- .flake8 | 3 ++- .github/workflows/main.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.flake8 b/.flake8 index 7b0e671d..7f6cc6e2 100644 --- a/.flake8 +++ b/.flake8 @@ -6,7 +6,8 @@ exclude = __pycache__, build, scripts, - docs + docs, + .venv extend-ignore = # See https://github.com/PyCQA/pycodestyle/issues/373 E203, diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7752cf14..77fc4033 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,7 @@ jobs: path: /home/runner/work/multinet/multinet/.venv/lib/python3.7/site-packages key: ${{ runner.os }}-pipenv-${{ hashFiles('/home/runner/work/multinet/multinet/Pipfile.lock') }}-0 - - name: Install yarn packages + - name: Install pipenv packages if: steps.multinet-cache.outputs.cache-hit != 'true' run: PIPENV_VENV_IN_PROJECT=1 pipenv install --dev --deploy From 57b6c7c314edc9cf46b3dbd7104bd11d73c08a90 Mon Sep 17 00:00:00 2001 From: JackWilb97 Date: Fri, 21 Feb 2020 15:08:27 -0700 Subject: [PATCH 09/25] adjust whitespace to test all caches --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 77fc4033..169160d3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -77,4 +77,3 @@ jobs: - run: cd multinetjs && yarn build - run: cd multinetjs && yarn lint - run: cd multinetjs && yarn test - From ba1762edf40eb7353cf5e6a4570ac1081491068b Mon Sep 17 00:00:00 2001 From: JackWilb97 Date: Fri, 21 Feb 2020 15:19:15 -0700 Subject: [PATCH 10/25] cache the whole venv and make pipenv aware --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 169160d3..d98e5ff2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,17 +29,16 @@ jobs: - uses: actions/cache@v1 id: multinet-cache with: - path: /home/runner/work/multinet/multinet/.venv/lib/python3.7/site-packages + path: /home/runner/work/multinet/multinet/.venv/ key: ${{ runner.os }}-pipenv-${{ hashFiles('/home/runner/work/multinet/multinet/Pipfile.lock') }}-0 - name: Install pipenv packages - if: steps.multinet-cache.outputs.cache-hit != 'true' run: PIPENV_VENV_IN_PROJECT=1 pipenv install --dev --deploy - - run: pipenv run lint - - run: pipenv run format - - run: pipenv run typecheck - - run: pipenv run test + - run: PIPENV_VENV_IN_PROJECT=1 pipenv run lint + - run: PIPENV_VENV_IN_PROJECT=1 pipenv run format + - run: PIPENV_VENV_IN_PROJECT=1 pipenv run typecheck + - run: PIPENV_VENV_IN_PROJECT=1 pipenv run test # Build and test Multinet client app. - uses: actions/setup-node@v1 @@ -77,3 +76,4 @@ jobs: - run: cd multinetjs && yarn build - run: cd multinetjs && yarn lint - run: cd multinetjs && yarn test + From 57192eaf1711b28b4ea06c0fc7cf23692d013b61 Mon Sep 17 00:00:00 2001 From: JackWilb97 Date: Fri, 21 Feb 2020 15:20:56 -0700 Subject: [PATCH 11/25] update cache name --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d98e5ff2..8dc64751 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: id: multinet-cache with: path: /home/runner/work/multinet/multinet/.venv/ - key: ${{ runner.os }}-pipenv-${{ hashFiles('/home/runner/work/multinet/multinet/Pipfile.lock') }}-0 + key: ${{ runner.os }}-pipenv-${{ hashFiles('/home/runner/work/multinet/multinet/Pipfile.lock') }}-1 - name: Install pipenv packages run: PIPENV_VENV_IN_PROJECT=1 pipenv install --dev --deploy From 5198b9e77a006e4f5c5268f7dbdf51f359b9af20 Mon Sep 17 00:00:00 2001 From: JackWilb97 Date: Fri, 21 Feb 2020 15:26:20 -0700 Subject: [PATCH 12/25] update whitespace to test cache --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8dc64751..cfe990da 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -76,4 +76,3 @@ jobs: - run: cd multinetjs && yarn build - run: cd multinetjs && yarn lint - run: cd multinetjs && yarn test - From b84865d70e0c847665764b5d6098cd1bc0b2d166 Mon Sep 17 00:00:00 2001 From: JackWilb97 Date: Fri, 21 Feb 2020 15:32:19 -0700 Subject: [PATCH 13/25] Change cache name --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cfe990da..47e14308 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: id: multinet-cache with: path: /home/runner/work/multinet/multinet/.venv/ - key: ${{ runner.os }}-pipenv-${{ hashFiles('/home/runner/work/multinet/multinet/Pipfile.lock') }}-1 + key: ${{ runner.os }}-pipenv-${{ hashFiles('/home/runner/work/multinet/multinet/Pipfile.lock') }}-cache - name: Install pipenv packages run: PIPENV_VENV_IN_PROJECT=1 pipenv install --dev --deploy @@ -76,3 +76,4 @@ jobs: - run: cd multinetjs && yarn build - run: cd multinetjs && yarn lint - run: cd multinetjs && yarn test + From a93211d7c5327f73ed14dd944e09041eae53f3c4 Mon Sep 17 00:00:00 2001 From: JackWilb97 Date: Fri, 21 Feb 2020 15:38:26 -0700 Subject: [PATCH 14/25] update whitespace for a rebuild --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 47e14308..b5a2fe8a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -76,4 +76,3 @@ jobs: - run: cd multinetjs && yarn build - run: cd multinetjs && yarn lint - run: cd multinetjs && yarn test - From abbae6f1483c1d078a956545f2dfe46b09aa3c02 Mon Sep 17 00:00:00 2001 From: JackWilb97 Date: Fri, 21 Feb 2020 15:46:13 -0700 Subject: [PATCH 15/25] remove the VENV env var --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b5a2fe8a..4a42ed27 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,10 +35,10 @@ jobs: - name: Install pipenv packages run: PIPENV_VENV_IN_PROJECT=1 pipenv install --dev --deploy - - run: PIPENV_VENV_IN_PROJECT=1 pipenv run lint - - run: PIPENV_VENV_IN_PROJECT=1 pipenv run format - - run: PIPENV_VENV_IN_PROJECT=1 pipenv run typecheck - - run: PIPENV_VENV_IN_PROJECT=1 pipenv run test + - run: pipenv run lint + - run: pipenv run format + - run: pipenv run typecheck + - run: pipenv run test # Build and test Multinet client app. - uses: actions/setup-node@v1 From 86f5cfe70526d052d975d24fa8cadfdfe43a560a Mon Sep 17 00:00:00 2001 From: JackWilb Date: Tue, 25 Feb 2020 11:01:58 -0700 Subject: [PATCH 16/25] clean up the cache names --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dd0cf82d..29e5e3cb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: id: multinet-cache with: path: /home/runner/work/multinet/multinet/.venv/ - key: ${{ runner.os }}-${{ env.PYTHON_VERSION }}-pipenv-${{ hashFiles('/home/runner/work/multinet/multinet/Pipfile.lock') }}-pipenv-cache + key: ${{ runner.os }}-${{ env.PYTHON_VERSION }}-${{ hashFiles('/home/runner/work/multinet/multinet/Pipfile.lock') }}-pipenv-cache - name: Install pipenv packages run: PIPENV_VENV_IN_PROJECT=1 pipenv install --dev --deploy @@ -49,7 +49,7 @@ jobs: id: client-cache with: path: /home/runner/work/multinet/multinet/client/node_modules - key: ${{ runner.os }}-yarn-${{ hashFiles('/home/runner/work/multinet/multinet/client/yarn.lock') }}-client-cache + key: ${{ runner.os }}-${{ hashFiles('/home/runner/work/multinet/multinet/client/yarn.lock') }}-client-cache - name: Install yarn packages if: steps.client-cache.outputs.cache-hit != 'true' @@ -67,7 +67,7 @@ jobs: id: multinetjs-cache with: path: /home/runner/work/multinet/multinet/multinetjs/node_modules - key: ${{ runner.os }}-yarn-${{ hashFiles('/home/runner/work/multinet/multinet/multinetjs/yarn.lock') }}-multinetjs-cache + key: ${{ runner.os }}-${{ hashFiles('/home/runner/work/multinet/multinet/multinetjs/yarn.lock') }}-multinetjs-cache - name: Install yarn packages if: steps.multinetjs-cache.outputs.cache-hit != 'true' From 8768e8039ef7daed0add47a20d6f3265a810112f Mon Sep 17 00:00:00 2001 From: JackWilb Date: Thu, 27 Feb 2020 10:15:03 -0700 Subject: [PATCH 17/25] use pipenv --venv insead of venv in project --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 29e5e3cb..e62762cb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,11 +29,11 @@ jobs: - uses: actions/cache@v1 id: multinet-cache with: - path: /home/runner/work/multinet/multinet/.venv/ + path: ${{ pipenv --venv }} key: ${{ runner.os }}-${{ env.PYTHON_VERSION }}-${{ hashFiles('/home/runner/work/multinet/multinet/Pipfile.lock') }}-pipenv-cache - name: Install pipenv packages - run: PIPENV_VENV_IN_PROJECT=1 pipenv install --dev --deploy + run: pipenv install --dev --deploy - run: pipenv run lint - run: pipenv run format From 0129e507c5cde3eb92e4d2b4cb6feb14d6514753 Mon Sep 17 00:00:00 2001 From: JackWilb Date: Thu, 27 Feb 2020 10:20:26 -0700 Subject: [PATCH 18/25] move the virtual env just up one level --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e62762cb..5c62ab9d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,11 +29,11 @@ jobs: - uses: actions/cache@v1 id: multinet-cache with: - path: ${{ pipenv --venv }} + path: /home/runner/work/multinet/.venv/ key: ${{ runner.os }}-${{ env.PYTHON_VERSION }}-${{ hashFiles('/home/runner/work/multinet/multinet/Pipfile.lock') }}-pipenv-cache - name: Install pipenv packages - run: pipenv install --dev --deploy + run: WORKON_HOME=/home/runner/work/multinet/ pipenv install --dev --deploy - run: pipenv run lint - run: pipenv run format From e5c50d7d080a8f02845f26210f83159594dc7d1c Mon Sep 17 00:00:00 2001 From: JackWilb Date: Thu, 27 Feb 2020 10:22:54 -0700 Subject: [PATCH 19/25] cache the whole venvs folder --- .flake8 | 3 +-- .github/workflows/main.yml | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.flake8 b/.flake8 index 7f6cc6e2..7b0e671d 100644 --- a/.flake8 +++ b/.flake8 @@ -6,8 +6,7 @@ exclude = __pycache__, build, scripts, - docs, - .venv + docs extend-ignore = # See https://github.com/PyCQA/pycodestyle/issues/373 E203, diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5c62ab9d..b21a8ff5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,11 +29,11 @@ jobs: - uses: actions/cache@v1 id: multinet-cache with: - path: /home/runner/work/multinet/.venv/ - key: ${{ runner.os }}-${{ env.PYTHON_VERSION }}-${{ hashFiles('/home/runner/work/multinet/multinet/Pipfile.lock') }}-pipenv-cache + path: /home/runner/work/multinet/.venvs/ + key: ${{ runner.os }}-${{ env.PYTHON_VERSION }}-${{ hashFiles('/home/runner/work/multinet/multinet/Pipfile.lock') }}-pipenv-cache-0 - name: Install pipenv packages - run: WORKON_HOME=/home/runner/work/multinet/ pipenv install --dev --deploy + run: WORKON_HOME=/home/runner/work/multinet/.venvs/ pipenv install --dev --deploy - run: pipenv run lint - run: pipenv run format From 22bb7cef93e0fd1267cf8b2055317157d1061446 Mon Sep 17 00:00:00 2001 From: JackWilb Date: Thu, 27 Feb 2020 10:27:21 -0700 Subject: [PATCH 20/25] set workon home for the whole script --- .github/workflows/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b21a8ff5..1d8051ce 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,8 +32,11 @@ jobs: path: /home/runner/work/multinet/.venvs/ key: ${{ runner.os }}-${{ env.PYTHON_VERSION }}-${{ hashFiles('/home/runner/work/multinet/multinet/Pipfile.lock') }}-pipenv-cache-0 + - name: Set venv directory + run: export WORKON_HOME=/home/runner/work/multinet/.venvs/ + - name: Install pipenv packages - run: WORKON_HOME=/home/runner/work/multinet/.venvs/ pipenv install --dev --deploy + run: pipenv install --dev --deploy - run: pipenv run lint - run: pipenv run format From dcee927c4237cfb2e3b351445c771f902e03d1f7 Mon Sep 17 00:00:00 2001 From: JackWilb Date: Thu, 27 Feb 2020 12:51:24 -0700 Subject: [PATCH 21/25] only pipenv install on cache miss --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1d8051ce..00db915e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,6 +33,7 @@ jobs: key: ${{ runner.os }}-${{ env.PYTHON_VERSION }}-${{ hashFiles('/home/runner/work/multinet/multinet/Pipfile.lock') }}-pipenv-cache-0 - name: Set venv directory + if: steps.multinet-cache.outputs.cache-hit != 'true' run: export WORKON_HOME=/home/runner/work/multinet/.venvs/ - name: Install pipenv packages From c968bb7ba6fc81a8c4ce064c680dffd426c0fdb4 Mon Sep 17 00:00:00 2001 From: JackWilb Date: Thu, 27 Feb 2020 12:57:19 -0700 Subject: [PATCH 22/25] remove python version to test --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 00db915e..4ecf5c08 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: id: multinet-cache with: path: /home/runner/work/multinet/.venvs/ - key: ${{ runner.os }}-${{ env.PYTHON_VERSION }}-${{ hashFiles('/home/runner/work/multinet/multinet/Pipfile.lock') }}-pipenv-cache-0 + key: ${{ runner.os }}-${{ hashFiles('/home/runner/work/multinet/multinet/Pipfile.lock') }}-pipenv-cache-0 - name: Set venv directory if: steps.multinet-cache.outputs.cache-hit != 'true' @@ -80,3 +80,4 @@ jobs: - run: cd multinetjs && yarn build - run: cd multinetjs && yarn lint - run: cd multinetjs && yarn test + From 88c0fc8574fbba6dc42a83af77598c5a6cc293e5 Mon Sep 17 00:00:00 2001 From: JackWilb Date: Thu, 27 Feb 2020 12:59:53 -0700 Subject: [PATCH 23/25] remove WORKON_HOME and just use default location in ~/.local --- .github/workflows/main.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4ecf5c08..1f9c7de0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,12 +29,8 @@ jobs: - uses: actions/cache@v1 id: multinet-cache with: - path: /home/runner/work/multinet/.venvs/ - key: ${{ runner.os }}-${{ hashFiles('/home/runner/work/multinet/multinet/Pipfile.lock') }}-pipenv-cache-0 - - - name: Set venv directory - if: steps.multinet-cache.outputs.cache-hit != 'true' - run: export WORKON_HOME=/home/runner/work/multinet/.venvs/ + path: /home/runner/.local/share/virtualenvs/ + key: ${{ runner.os }}-${{ hashFiles('/home/runner/work/multinet/multinet/Pipfile.lock') }}-pipenv-cache-1 - name: Install pipenv packages run: pipenv install --dev --deploy From 30919f91dca477383a997d5e0d787758a66bf527 Mon Sep 17 00:00:00 2001 From: JackWilb Date: Thu, 27 Feb 2020 13:04:56 -0700 Subject: [PATCH 24/25] modify whitespace to trigger rebuild --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1f9c7de0..dc7e7f92 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -76,4 +76,3 @@ jobs: - run: cd multinetjs && yarn build - run: cd multinetjs && yarn lint - run: cd multinetjs && yarn test - From fd999a805b562e3872f10fc13ed9154c64ae1d7c Mon Sep 17 00:00:00 2001 From: JackWilb Date: Thu, 27 Feb 2020 13:09:01 -0700 Subject: [PATCH 25/25] don't run pipenv install when we hit the cache --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dc7e7f92..c8fd6af9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,6 +33,7 @@ jobs: key: ${{ runner.os }}-${{ hashFiles('/home/runner/work/multinet/multinet/Pipfile.lock') }}-pipenv-cache-1 - name: Install pipenv packages + if: steps.multinet-cache.outputs.cache-hit != 'true' run: pipenv install --dev --deploy - run: pipenv run lint