From 8dae093517ab921cb53aaac698a4a2f2bb13e219 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Wed, 27 Dec 2023 09:55:32 +0100 Subject: [PATCH] ci: the latest Ninja is now installed using pip --- .github/workflows/ci-conan.yml | 18 ++++-------------- .github/workflows/ci-test-package-cmake.yml | 18 ++++-------------- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index 2a41e36f..b6f6254c 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -167,24 +167,14 @@ jobs: shell: bash run: | sudo xcode-select -s /Applications/Xcode_${{ matrix.config.compiler.version }}.app && /usr/bin/xcodebuild -version - - name: Install Ninja - shell: bash - run: | - if [ $RUNNER_OS == 'Linux' ]; then - sudo apt install -y ninja-build - elif [ $RUNNER_OS == 'Windows' ]; then - choco install ninja - elif [ $RUNNER_OS == 'macOS' ]; then - brew update - brew install ninja - else - echo "'$RUNNER_OS' not supported" - exit 1 - fi - name: Set up Python uses: actions/setup-python@v4 with: python-version: "3.8" + - name: Install Ninja + shell: bash + run: | + pip install -U ninja - name: Install Conan shell: bash run: | diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml index add6fdf1..ea9afa96 100644 --- a/.github/workflows/ci-test-package-cmake.yml +++ b/.github/workflows/ci-test-package-cmake.yml @@ -162,24 +162,14 @@ jobs: shell: bash run: | sudo xcode-select -s /Applications/Xcode_${{ matrix.config.compiler.version }}.app && /usr/bin/xcodebuild -version - - name: Install Ninja - shell: bash - run: | - if [ $RUNNER_OS == 'Linux' ]; then - sudo apt install -y ninja-build - elif [ $RUNNER_OS == 'Windows' ]; then - choco install ninja - elif [ $RUNNER_OS == 'macOS' ]; then - brew update - brew install ninja - else - echo "'$RUNNER_OS' not supported" - exit 1 - fi - name: Set up Python uses: actions/setup-python@v4 with: python-version: "3.8" + - name: Install Ninja + shell: bash + run: | + pip install -U ninja - name: Install Conan shell: bash run: |