Skip to content

Commit 87720e6

Browse files
committed
Use powershell for everything
1 parent e69e664 commit 87720e6

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

.github/workflows/release-binaries.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -247,25 +247,19 @@ jobs:
247247
id: setup-stage
248248
uses: ./workflows-main/.github/workflows/release-binaries-setup-stage
249249

250-
- name: Shorten paths on windows
251-
run: |
252-
subst S: ${{ github.workspace }}
253-
mkdir "S:\build"
254-
subst B: S:\build
255-
256250
- name: Configure
257251
id: build
258-
shell: bash
259252
env:
260253
CCACHE_BIN: ${{ needs.prepare.outputs.ccache }}
261254
CMAKE: /c/Android/android-sdk/cmake/3.31.5/bin/cmake.exe
262255
run: |
263256
# There were some issues on the ARM64 MacOS runners with trying to build x86 object,
264257
# so we need to set some extra cmake flags to disable this.
265-
export PATH=C:\Strawberry\c\bin\:$PATH
266-
$CMAKE -G Ninja -S /s/llvm/ -B /b \
258+
#export PATH=C:\Strawberry\c\bin\:$PATH
259+
subst S: ${{ github.workspace }}
260+
cmake -G Ninja -S S:\ -B S:\build \
267261
${{ needs.prepare.outputs.target-cmake-flags }} \
268-
-C clang/cmake/caches/Release.cmake \
262+
-C clang\cmake\caches\Release.cmake \
269263
-DBOOTSTRAP_LLVM_PARALLEL_LINK_JOBS=1 \
270264
-DCMAKE_OBJECT_PATH_MAX=500 \
271265
-DCMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS=1 \
@@ -299,10 +293,8 @@ jobs:
299293
# ninja: error: mkdir(tools/clang/tools/extra/clang-tidy/misc/ConfusableTable/CMakeFiles/clang-tidy-confusable-chars-gen.dir/C_/actions-runner/llvm-project/llvm-project/llvm): No such file or directory
300294
- name: Build Windows
301295
if: runner.os == 'Windows'
302-
shell: bash
303296
run: |
304-
tail /b/build.ninja
305-
ninja -v -C /b stage2-package
297+
ninja -v -C "S:\build" stage2-package
306298
307299
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
308300
with:

0 commit comments

Comments
 (0)