ci: the latest Ninja is now installed using pip

This commit is contained in:
Mateusz Pusz
2023-12-27 09:55:32 +01:00
parent 6c2550ddfc
commit 8dae093517
2 changed files with 8 additions and 28 deletions

View File

@@ -167,24 +167,14 @@ jobs:
shell: bash shell: bash
run: | run: |
sudo xcode-select -s /Applications/Xcode_${{ matrix.config.compiler.version }}.app && /usr/bin/xcodebuild -version 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 - name: Set up Python
uses: actions/setup-python@v4 uses: actions/setup-python@v4
with: with:
python-version: "3.8" python-version: "3.8"
- name: Install Ninja
shell: bash
run: |
pip install -U ninja
- name: Install Conan - name: Install Conan
shell: bash shell: bash
run: | run: |

View File

@@ -162,24 +162,14 @@ jobs:
shell: bash shell: bash
run: | run: |
sudo xcode-select -s /Applications/Xcode_${{ matrix.config.compiler.version }}.app && /usr/bin/xcodebuild -version 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 - name: Set up Python
uses: actions/setup-python@v4 uses: actions/setup-python@v4
with: with:
python-version: "3.8" python-version: "3.8"
- name: Install Ninja
shell: bash
run: |
pip install -U ninja
- name: Install Conan - name: Install Conan
shell: bash shell: bash
run: | run: |