From e0cf32c6de36328f8d72382879ee59a7eff80e0a Mon Sep 17 00:00:00 2001 From: James McCoy Date: Fri, 24 Sep 2021 09:01:30 -0400 Subject: [PATCH 1/2] ci: add macOS 11 build --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f75320048b..fd15159ced 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,9 @@ jobs: - cc: clang runner: macos-10.15 os: osx + - cc: clang + runner: macos-11.0 + os: osx - flavor: functionaltest-lua cc: gcc runner: ubuntu-20.04 From 64a5eddc8939b9f482433892ba91eb7490fd460d Mon Sep 17 00:00:00 2001 From: James McCoy Date: Fri, 24 Sep 2021 09:01:50 -0400 Subject: [PATCH 2/2] ci: use runner, instead of os, for job name and cache key --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fd15159ced..0dbe484108 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ on: jobs: unixish: - name: ${{ matrix.os }} ${{ matrix.flavor }} (cc=${{ matrix.cc }}) + name: ${{ matrix.runner }} ${{ matrix.flavor }} (cc=${{ matrix.cc }}) strategy: fail-fast: false matrix: @@ -83,7 +83,7 @@ jobs: path: | ${{ env.CACHE_NVIM_DEPS_DIR }} ~/.ccache - key: ${{ runner.os }}-${{ matrix.flavor }}-${{ matrix.cc }}-${{ hashFiles('cmake/*', 'third-party/**', '**/CMakeLists.txt') }}-${{ github.base_ref }} + key: ${{ matrix.runner }}-${{ matrix.flavor }}-${{ matrix.cc }}-${{ hashFiles('cmake/*', 'third-party/**', '**/CMakeLists.txt') }}-${{ github.base_ref }} - name: Build third-party run: ./ci/before_script.sh