From b90799c277fc36ffb91c3a0505e8bd7ce3fda23f Mon Sep 17 00:00:00 2001 From: Sergiu Deitsch Date: Thu, 5 Oct 2023 20:25:02 +0200 Subject: [PATCH] ci: drop setup-ninja action --- .github/workflows/android.yml | 12 +++++++----- .github/workflows/emscripten.yml | 4 ++-- .github/workflows/macos.yml | 7 +------ 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index e860d0a3f..b2ac5821c 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: build-android: name: NDK-C++${{matrix.std}}-${{matrix.abi}}-${{matrix.build_type}} - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 defaults: run: shell: bash @@ -21,10 +21,12 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Setup Ninja - uses: ashutoshvarma/setup-ninja@master - with: - version: 1.10.0 + - name: Setup Dependencies + run: | + sudo apt-get update + DEBIAN_FRONTEND=noninteractive sudo apt-get install -y \ + cmake \ + ninja-build - name: Setup NDK env: diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml index 4bbb6dc56..c187ce49f 100644 --- a/.github/workflows/emscripten.yml +++ b/.github/workflows/emscripten.yml @@ -8,7 +8,7 @@ jobs: run: shell: bash name: Emscripten-C++${{matrix.std}}-${{matrix.build_type}}-${{matrix.lib}} - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 container: emscripten/emsdk strategy: fail-fast: true @@ -22,7 +22,7 @@ jobs: - name: Setup Dependencies run: | - apt-get update + sudo apt-get update DEBIAN_FRONTEND=noninteractive sudo apt-get install -y \ cmake \ ninja-build diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 51cf7ffb6..6d202b348 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -17,14 +17,9 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Setup Ninja - uses: ashutoshvarma/setup-ninja@master - with: - version: 1.10.0 - - name: Setup Dependencies run: | - brew install lcov + brew install lcov ninja - name: Setup Environment if: matrix.build_type == 'Debug'