From 96e504a8049446b3fdad06984e098f0e2a032052 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 9 Oct 2022 09:08:43 +0200 Subject: [PATCH] Try using an another shell. --- .github/actions/pandemonium-build-win-x86/action.yml | 5 ++--- .github/workflows/windows_x86_builds.yml | 5 +++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/actions/pandemonium-build-win-x86/action.yml b/.github/actions/pandemonium-build-win-x86/action.yml index 059b2e65a..459f7430d 100644 --- a/.github/actions/pandemonium-build-win-x86/action.yml +++ b/.github/actions/pandemonium-build-win-x86/action.yml @@ -27,13 +27,12 @@ runs: using: "composite" steps: - name: Scons Build - shell: cmd + shell: pwsh env: SCONSFLAGS: ${{ inputs.sconsflags }} SCONS_CACHE: ${{ inputs.scons-cache }} SCONS_CACHE_LIMIT: ${{ inputs.scons-cache-limit }} run: | - call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\vcvarsall.bat" x86 echo "Building with flags:" ${{ env.SCONSFLAGS }} scons p=${{ inputs.platform }} target=${{ inputs.target }} tools=${{ inputs.tools }} tests=${{ inputs.tests }} --jobs=2 ${{ env.SCONSFLAGS }} - dir /a bin/ + ls -l bin/ diff --git a/.github/workflows/windows_x86_builds.yml b/.github/workflows/windows_x86_builds.yml index b6e5d7e10..f942ab180 100644 --- a/.github/workflows/windows_x86_builds.yml +++ b/.github/workflows/windows_x86_builds.yml @@ -45,6 +45,11 @@ jobs: - name: Setup python and scons uses: ./.github/actions/pandemonium-deps + - name: Set up Visual Studio shell + uses: egor-tensin/vs-shell@v2 + with: + arch: x86 + - name: Compilation uses: ./.github/actions/pandemonium-build with: