Skip to content

Commit a38ef6e

Browse files
Revert "shell"
This reverts commit 7d810e3.
1 parent 397e8d5 commit a38ef6e

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

.github/workflows/rebuildDependencies.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ jobs:
6060
conan_profile: msvc-x64
6161
conan_options: -o target_pre_windows10=True
6262
runs-on: ${{ matrix.os }}
63+
defaults:
64+
run:
65+
shell: bash
6366
steps:
6467
- name: Checkout VCMI
6568
uses: actions/checkout@v4
@@ -76,7 +79,6 @@ jobs:
7679

7780
- name: Prepare CI
7881
if: ${{ matrix.before_install }}
79-
shell: bash
8082
run: source '${{github.workspace}}/CI/before_install/${{matrix.before_install}}'
8183

8284
- name: Setup Conan Client
@@ -86,7 +88,6 @@ jobs:
8688
# https://github.com/actions/runner-images/tree/main/images
8789
# using CMake from Android SDK because some runners already have CMake v4
8890
- name: Prepare platform tools
89-
shell: bash
9091
run: |
9192
cmakeVersion=3.31.6
9293
@@ -103,7 +104,6 @@ jobs:
103104
tools.cmake.cmaketoolchain:generator=Ninja" >> $(conan profile path default)
104105
105106
- name: Install system libs recipes
106-
shell: bash
107107
if: ${{ matrix.conan_system_libs }}
108108
run: |
109109
systemLibsRepo='conan-system-libs'
@@ -122,7 +122,6 @@ jobs:
122122
path: deps
123123

124124
- name: Build recipes with our patches
125-
shell: bash
126125
run: |
127126
set -x
128127
cciRepo='conan-center-index'
@@ -179,7 +178,6 @@ jobs:
179178
180179
# TODO: remove when https://github.com/conan-io/conan-center-index/pull/26577 is merged
181180
- name: Build LuaJIT from PR changes
182-
shell: bash
183181
run: |
184182
cciForkRepo='cci-fork'
185183
branchName='package/luajit'
@@ -202,17 +200,19 @@ jobs:
202200
--build=missing \
203201
--test-folder=''
204202
205-
# FFmpeg doesn't build with msvc in bash
206203
- name: Generate conan profile
207204
run: |
208-
conan install . --output-folder=conan-generated --build=missing --profile=CI/conan/${{ matrix.conan_profile }} ${{ matrix.conan_options }}
205+
conan install . \
206+
--output-folder=conan-generated \
207+
--build=missing \
208+
--profile=CI/conan/${{ matrix.conan_profile }} \
209+
${{ matrix.conan_options }}
209210
210211
- name: Remove builds and source code
211212
run: conan cache clean
212213

213214
- name: Get NDK path
214215
if: ${{ startsWith(matrix.platform, 'android') }}
215-
shell: bash
216216
run: |
217217
ndkPackage='android-ndk'
218218
hexRegex='[[:xdigit:]]+'
@@ -224,7 +224,6 @@ jobs:
224224
echo "NDK directory: $ndkPath"
225225
226226
- name: Remove build requirements' binaries
227-
shell: bash
228227
run: |
229228
graphFile='graph.json'
230229
packageListFile='pkglist.json'
@@ -243,7 +242,6 @@ jobs:
243242
conan remove --list "$packageListFile" --confirm
244243
245244
- name: Create list of built packages
246-
shell: bash
247245
run: |
248246
packageList="$(conan list --format=compact | tail -n +2)"
249247
echo "CONAN_PACKAGES<<EOF

0 commit comments

Comments
 (0)