Skip to content

Commit 87d62b3

Browse files
default bash, use Conan action, use default CMake
1 parent 4a9085d commit 87d62b3

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

.github/workflows/rebuildDependencies.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ jobs:
4343
conan_profile: msvc-x64
4444
conan_options: -o target_pre_windows10=True
4545
runs-on: ${{ matrix.os }}
46+
defaults:
47+
run:
48+
shell: bash
4649

4750
steps:
4851
- name: Checkout VCMI
@@ -60,25 +63,25 @@ jobs:
6063

6164
- name: Prepare CI
6265
if: ${{ matrix.before_install }}
63-
shell: bash
6466
run: source '${{github.workspace}}/CI/before_install/${{matrix.before_install}}'
6567

66-
- name: Install Conan
68+
- name: Setup Conan Client
69+
uses: conan-io/setup-conan@v1
70+
71+
- name: Create default Conan profile
6772
run: |
68-
pipx install conan
6973
conan profile detect
7074
7175
# CMake/Ninja version should be synced with runners
7276
# https://github.com/actions/runner-images/tree/main/images
7377
# using CMake from Android SDK because some runners already have CMake v4
7478
- name: Prepare platform tools
75-
shell: bash
7679
run: |
77-
cmakeVersion=3.31.5
80+
cmakeVersion=3.31.6
7881
79-
newPathFile=$(mktemp)
80-
echo "$ANDROID_HOME/cmake/$cmakeVersion/bin" | cat - "$GITHUB_PATH" > "$newPathFile"
81-
mv -f "$newPathFile" "$GITHUB_PATH"
82+
# newPathFile=$(mktemp)
83+
# echo "$ANDROID_HOME/cmake/$cmakeVersion/bin" | cat - "$GITHUB_PATH" > "$newPathFile"
84+
# mv -f "$newPathFile" "$GITHUB_PATH"
8285
8386
echo "
8487
[platform_tool_requires]
@@ -90,7 +93,6 @@ jobs:
9093
9194
- name: Install system libs recipes
9295
if: ${{ matrix.conan_system_libs }}
93-
shell: bash
9496
run: |
9597
systemLibsRepo='conan-system-libs'
9698
git clone "https://github.com/kambala-decapitator/$systemLibsRepo.git" \
@@ -108,7 +110,6 @@ jobs:
108110
path: deps
109111

110112
- name: Build recipes with our patches
111-
shell: bash
112113
run: |
113114
set -x
114115
cciRepo='conan-center-index'
@@ -168,7 +169,6 @@ jobs:
168169
169170
# TODO: remove when https://github.com/conan-io/conan-center-index/pull/26577 is merged
170171
- name: Build LuaJIT from PR changes
171-
shell: bash
172172
run: |
173173
cciForkRepo='cci-fork'
174174
branchName='package/luajit'
@@ -200,7 +200,6 @@ jobs:
200200
run: conan cache clean
201201

202202
- name: Remove build requirements' binaries
203-
shell: bash
204203
run: |
205204
buildPackages=$(conan graph info . \
206205
--profile=CI/conan/${{ matrix.conan_profile }} \

0 commit comments

Comments
 (0)