From 420b569d4901c1438d891cee2080950016d13f16 Mon Sep 17 00:00:00 2001 From: staphen Date: Wed, 12 Feb 2025 23:32:48 -0500 Subject: [PATCH] Update cache version of Linux CI build scripts --- .github/workflows/Linux_aarch64.yml | 4 ++-- .github/workflows/Linux_x86.yml | 4 ++-- .github/workflows/Linux_x86_64.yml | 4 ++-- .github/workflows/Linux_x86_64_SDL1.yml | 4 ++-- .github/workflows/Linux_x86_64_test.yml | 5 +++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/Linux_aarch64.yml b/.github/workflows/Linux_aarch64.yml index 7470f8bdc58..a9efd69685c 100644 --- a/.github/workflows/Linux_aarch64.yml +++ b/.github/workflows/Linux_aarch64.yml @@ -64,8 +64,8 @@ jobs: uses: actions/cache@v4 with: path: build - key: ${{ github.workflow }}-v6-${{ github.sha }} - restore-keys: ${{ github.workflow }}-v6- + key: ${{ github.workflow }}-v7-${{ github.sha }} + restore-keys: ${{ github.workflow }}-v7- - name: Build working-directory: ${{github.workspace}} diff --git a/.github/workflows/Linux_x86.yml b/.github/workflows/Linux_x86.yml index 8a350cb5008..26f100aa7c0 100644 --- a/.github/workflows/Linux_x86.yml +++ b/.github/workflows/Linux_x86.yml @@ -55,8 +55,8 @@ jobs: uses: actions/cache@v4 with: path: build - key: ${{ github.workflow }}-v5-${{ github.sha }} - restore-keys: ${{ github.workflow }}-v5- + key: ${{ github.workflow }}-v6-${{ github.sha }} + restore-keys: ${{ github.workflow }}-v6- - name: Build working-directory: ${{github.workspace}} diff --git a/.github/workflows/Linux_x86_64.yml b/.github/workflows/Linux_x86_64.yml index e3498940935..1796b82be04 100644 --- a/.github/workflows/Linux_x86_64.yml +++ b/.github/workflows/Linux_x86_64.yml @@ -53,8 +53,8 @@ jobs: uses: actions/cache@v4 with: path: build - key: ${{ github.workflow }}-v5-${{ github.sha }} - restore-keys: ${{ github.workflow }}-v5- + key: ${{ github.workflow }}-v6-${{ github.sha }} + restore-keys: ${{ github.workflow }}-v6- - name: Build working-directory: ${{github.workspace}} diff --git a/.github/workflows/Linux_x86_64_SDL1.yml b/.github/workflows/Linux_x86_64_SDL1.yml index 65d1ea51bc0..21ba410c1d0 100644 --- a/.github/workflows/Linux_x86_64_SDL1.yml +++ b/.github/workflows/Linux_x86_64_SDL1.yml @@ -35,8 +35,8 @@ jobs: uses: actions/cache@v4 with: path: build - key: ${{ github.workflow }}-v2-${{ github.sha }} - restore-keys: ${{ github.workflow }}-v2- + key: ${{ github.workflow }}-v3-${{ github.sha }} + restore-keys: ${{ github.workflow }}-v3- - name: Configure CMake shell: bash diff --git a/.github/workflows/Linux_x86_64_test.yml b/.github/workflows/Linux_x86_64_test.yml index e381b1071e5..be4762dc841 100644 --- a/.github/workflows/Linux_x86_64_test.yml +++ b/.github/workflows/Linux_x86_64_test.yml @@ -31,12 +31,13 @@ jobs: run: | sudo apt-get update -y sudo apt-get install -y cmake curl g++ git lcov libgtest-dev libgmock-dev libbenchmark-dev libfmt-dev libsdl2-dev libsodium-dev libpng-dev libbz2-dev wget + - name: Cache CMake build folder uses: actions/cache@v4 with: path: build - key: ${{ github.workflow }}-v1-${{ github.sha }} - restore-keys: ${{ github.workflow }}-v1- + key: ${{ github.workflow }}-v2-${{ github.sha }} + restore-keys: ${{ github.workflow }}-v2- # We specify `-DDEVILUTIONX_SYSTEM_BENCHMARK=OFF` to work around the following error: # lto1: fatal error: bytecode stream in file ‘/usr/lib/x86_64-linux-gnu/libbenchmark_main.a’ generated with LTO version 11.2 instead of the expected 11.3