From 7c32d47713d854d46d43981538a0e22df2f335a3 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Tue, 6 Jul 2021 21:34:56 +0200 Subject: [PATCH] workflows: Disable cache for inspircd + add version flavor to the cache key for others --- .github/workflows/test-devel.yml | 17 +++++----------- .github/workflows/test-devel_release.yml | 7 ------- .github/workflows/test-stable.yml | 19 ++++++----------- make_workflows.py | 26 ++++++++++++++++-------- workflows.yml | 1 + 5 files changed, 30 insertions(+), 40 deletions(-) diff --git a/.github/workflows/test-devel.yml b/.github/workflows/test-devel.yml index 803dd0d..4c4f4b9 100644 --- a/.github/workflows/test-devel.yml +++ b/.github/workflows/test-devel.yml @@ -37,7 +37,7 @@ jobs: - name: Cache dependencies uses: actions/cache@v2 with: - key: ${{ runner.os }}-ergo + key: ${{ runner.os }}-ergo-devel path: |- ~/.cache $GITHUB_WORKSPACE/ergo @@ -73,13 +73,6 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.7 - - name: Cache dependencies - uses: actions/cache@v2 - with: - key: ${{ runner.os }}-inspircd - path: |- - ~/.cache - $GITHUB_WORKSPACE/inspircd - name: Install dependencies run: |- sudo apt-get install atheme-services @@ -118,7 +111,7 @@ jobs: - name: Cache dependencies uses: actions/cache@v2 with: - key: ${{ runner.os }}-limnoria + key: ${{ runner.os }}-limnoria-devel path: |- ~/.cache $GITHUB_WORKSPACE/placeholder @@ -148,7 +141,7 @@ jobs: - name: Cache dependencies uses: actions/cache@v2 with: - key: ${{ runner.os }}-solanum + key: ${{ runner.os }}-solanum-devel path: |- ~/.cache $GITHUB_WORKSPACE/solanum @@ -189,7 +182,7 @@ jobs: - name: Cache dependencies uses: actions/cache@v2 with: - key: ${{ runner.os }}-sopel + key: ${{ runner.os }}-sopel-devel path: |- ~/.cache $GITHUB_WORKSPACE/placeholder @@ -219,7 +212,7 @@ jobs: - name: Cache dependencies uses: actions/cache@v2 with: - key: ${{ runner.os }}-unrealircd + key: ${{ runner.os }}-unrealircd-devel path: |- ~/.cache $GITHUB_WORKSPACE/unrealircd diff --git a/.github/workflows/test-devel_release.yml b/.github/workflows/test-devel_release.yml index c9d0c11..66f2ca8 100644 --- a/.github/workflows/test-devel_release.yml +++ b/.github/workflows/test-devel_release.yml @@ -25,13 +25,6 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.7 - - name: Cache dependencies - uses: actions/cache@v2 - with: - key: ${{ runner.os }}-inspircd - path: |- - ~/.cache - $GITHUB_WORKSPACE/inspircd - name: Install dependencies run: |- sudo apt-get install atheme-services diff --git a/.github/workflows/test-stable.yml b/.github/workflows/test-stable.yml index f074571..80f874c 100644 --- a/.github/workflows/test-stable.yml +++ b/.github/workflows/test-stable.yml @@ -34,7 +34,7 @@ jobs: - name: Cache dependencies uses: actions/cache@v2 with: - key: ${{ runner.os }}-charybdis + key: ${{ runner.os }}-charybdis-stable path: |- ~/.cache $GITHUB_WORKSPACE/charybdis @@ -79,7 +79,7 @@ jobs: - name: Cache dependencies uses: actions/cache@v2 with: - key: ${{ runner.os }}-ergo + key: ${{ runner.os }}-ergo-stable path: |- ~/.cache $GITHUB_WORKSPACE/ergo @@ -115,13 +115,6 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.7 - - name: Cache dependencies - uses: actions/cache@v2 - with: - key: ${{ runner.os }}-inspircd - path: |- - ~/.cache - $GITHUB_WORKSPACE/inspircd - name: Install dependencies run: |- sudo apt-get install atheme-services @@ -160,7 +153,7 @@ jobs: - name: Cache dependencies uses: actions/cache@v2 with: - key: ${{ runner.os }}-limnoria + key: ${{ runner.os }}-limnoria-stable path: |- ~/.cache $GITHUB_WORKSPACE/placeholder @@ -190,7 +183,7 @@ jobs: - name: Cache dependencies uses: actions/cache@v2 with: - key: ${{ runner.os }}-solanum + key: ${{ runner.os }}-solanum-stable path: |- ~/.cache $GITHUB_WORKSPACE/solanum @@ -231,7 +224,7 @@ jobs: - name: Cache dependencies uses: actions/cache@v2 with: - key: ${{ runner.os }}-sopel + key: ${{ runner.os }}-sopel-stable path: |- ~/.cache $GITHUB_WORKSPACE/placeholder @@ -261,7 +254,7 @@ jobs: - name: Cache dependencies uses: actions/cache@v2 with: - key: ${{ runner.os }}-unrealircd + key: ${{ runner.os }}-unrealircd-stable path: |- ~/.cache $GITHUB_WORKSPACE/unrealircd diff --git a/make_workflows.py b/make_workflows.py index 32fd67c..3d38489 100644 --- a/make_workflows.py +++ b/make_workflows.py @@ -84,6 +84,23 @@ def get_build_job(*, software_config, software_id, version_flavor): if env: env += " " + if software_config.get("cache", True): + cache = [ + { + "name": "Cache dependencies", + "uses": "actions/cache@v2", + "with": { + "path": script("~/.cache", f"$GITHUB_WORKSPACE/{path}"), + "key": "${{ runner.os }}-" + + software_id + + "-" + + version_flavor.value, + }, + } + ] + else: + cache = [] + return { "runs-on": "ubuntu-latest", "steps": [ @@ -94,14 +111,7 @@ def get_build_job(*, software_config, software_id, version_flavor): "with": {"python-version": 3.7}, }, *software_config.get("pre_deps", []), - { - "name": "Cache dependencies", - "uses": "actions/cache@v2", - "with": { - "path": script("~/.cache", f"$GITHUB_WORKSPACE/{path}"), - "key": "${{ runner.os }}-" + software_id, - }, - }, + *cache, { "name": "Install dependencies", "run": script( diff --git a/workflows.yml b/workflows.yml index 09c0996..d6e0da6 100644 --- a/workflows.yml +++ b/workflows.yml @@ -75,6 +75,7 @@ software: devel: "PYTEST_ARGS=\"$PYTEST_ARGS -m 'not services'\"" path: inspircd prefix: ~/.local/inspircd + cache: false # incremental compilation is frequently broken build_script: | cd $GITHUB_WORKSPACE/inspircd/ patch src/inspircd.cpp < $GITHUB_WORKSPACE/inspircd_mainloop.patch