mirror of
https://github.com/vcmi/vcmi.git
synced 2025-02-13 13:18:43 +02:00
Use python provided in CI runner image instead of installing via action
This commit is contained in:
parent
9a1f26883d
commit
2506490db4
13
.github/workflows/github.yml
vendored
13
.github/workflows/github.yml
vendored
@ -178,15 +178,13 @@ jobs:
|
|||||||
mkdir -p ~/.local/share/vcmi/
|
mkdir -p ~/.local/share/vcmi/
|
||||||
mv h3_assets/* ~/.local/share/vcmi/
|
mv h3_assets/* ~/.local/share/vcmi/
|
||||||
|
|
||||||
- uses: actions/setup-python@v5
|
- name: Install Conan
|
||||||
if: "${{ matrix.conan_profile != '' }}"
|
if: "${{ matrix.conan_profile != '' }}"
|
||||||
with:
|
run: pipx install 'conan<2.0'
|
||||||
python-version: '3.10'
|
|
||||||
|
|
||||||
- name: Conan setup
|
- name: Install Conan profile
|
||||||
if: "${{ matrix.conan_profile != '' }}"
|
if: "${{ matrix.conan_profile != '' }}"
|
||||||
run: |
|
run: |
|
||||||
pip3 install 'conan<2.0'
|
|
||||||
conan profile new default --detect
|
conan profile new default --detect
|
||||||
conan install . \
|
conan install . \
|
||||||
--install-folder=conan-generated \
|
--install-folder=conan-generated \
|
||||||
@ -364,11 +362,6 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- uses: actions/setup-python@v5
|
|
||||||
if: "${{ matrix.conan_profile != '' }}"
|
|
||||||
with:
|
|
||||||
python-version: '3.10'
|
|
||||||
|
|
||||||
- name: Ensure LF line endings
|
- name: Ensure LF line endings
|
||||||
run: |
|
run: |
|
||||||
find . -path ./.git -prune -o -path ./AI/FuzzyLite -prune -o -path ./test/googletest \
|
find . -path ./.git -prune -o -path ./AI/FuzzyLite -prune -o -path ./test/googletest \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user