From d352dd2dd1736983fd496d24fbaa0b2eceda802e Mon Sep 17 00:00:00 2001 From: crazy hugsy Date: Sat, 27 Jul 2024 13:38:43 -0700 Subject: [PATCH] so many mistakes --- .github/workflows/run-tests.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 35429e811..d16891016 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -19,12 +19,12 @@ jobs: strategy: fail-fast: false matrix: - os: + runner: - ubuntu-24.04 - ubuntu-22.04 - ubuntu-20.04 - name: "Run Unit tests on ${{ matrix.os }}" - runs-on: ${{ matrix.os }} + name: "Run Unit tests on ${{ matrix.runner }}" + runs-on: ${{ matrix.runner }} defaults: run: shell: bash @@ -39,7 +39,7 @@ jobs: sudo apt-get install -y gdb-multiarch python3-dev python3-pip python3-wheel python3-setuptools git cmake gcc g++ pkg-config libglib2.0-dev gdbserver qemu-user - name: Install python and toolchain - if: ${{ runner.os }} == 'ubuntu-24.04' + if: ${{ matrix.runner }} == 'ubuntu-24.04' run: | sudo apt-get install -y python3-full @@ -56,23 +56,23 @@ jobs: env: cache-name: cache-deps with: - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} + key: ${{ matrix.runner }}-pip-${{ hashFiles('**/requirements.txt') }} path: ${{ env.GEF_CI_CACHE_DIR }} restore-keys: - ${{ runner.os }}-pip-${{ env.cache-name }}- - ${{ runner.os }}-pip- - ${{ runner.os }}-${{ env.cache-name }}- - ${{ runner.os }}- + ${{ matrix.runner }}-pip-${{ env.cache-name }}- + ${{ matrix.runner }}-pip- + ${{ matrix.runner }}-${{ env.cache-name }}- + ${{ matrix.runner }}- - name: Install python and toolchain - if: ${{ runner.os }} != 'ubuntu-24.04' + if: ${{ matrix.runner }} != 'ubuntu-24.04' run: | test "${{ env.PY_VER }}" == "0" && exit 1 mkdir -p ${{ env.GEF_CI_CACHE_DIR }} python${{ env.PY_VER }} -m pip install --user --upgrade -r tests/requirements.txt - name: Install Python Requirements - if: ${{ runner.os }} == 'ubuntu-24.04' + if: ${{ matrix.runner }} == 'ubuntu-24.04' run: | test "${{ env.PY_VER }}" == "0" && exit 1 mkdir -p ${{ env.GEF_CI_CACHE_DIR }}