Update ci.yml

recp · Jan 22, 2025 · 3971ef8 · 3971ef8
1 parent b4a3ed3
commit 3971ef8
Showing 1 changed file with 25 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -186,29 +186,33 @@ jobs:
       if: runner.os == 'macOS'
       run: brew upgrade && brew install ninja
 
-    - name: Set SIMD flags
-      shell: ${{ runner.os == 'Windows' && 'pwsh' || 'bash' }}
+    - name: Set SIMD flags (Windows)
+      if: runner.os == 'Windows'
+      shell: pwsh
       run: |
-        ${{ runner.os == 'Windows' && '
         $simd = "${{ matrix.simd }}"
         if ($simd -eq "none") {
-          $Env:CFLAGS = ""
+          $env:CFLAGS = ""
         } elseif ($simd -eq "sse") {
-          $Env:CFLAGS = "-arch:SSE"
+          $env:CFLAGS = "-arch:SSE"
         } elseif ($simd -eq "sse2") {
-          $Env:CFLAGS = "-arch:SSE2"
+          $env:CFLAGS = "-arch:SSE2"
         } elseif ($simd -eq "sse3") {
-          $Env:CFLAGS = "-arch:SSE3"
+          $env:CFLAGS = "-arch:SSE3"
         } elseif ($simd -eq "sse4") {
-          $Env:CFLAGS = "-arch:SSE4"
+          $env:CFLAGS = "-arch:SSE4"
         } elseif ($simd -eq "avx") {
-          $Env:CFLAGS = "-arch:AVX"
+          $env:CFLAGS = "-arch:AVX"
         } elseif ($simd -eq "avx2") {
-          $Env:CFLAGS = "-arch:AVX2"
+          $env:CFLAGS = "-arch:AVX2"
         } elseif ($simd -eq "neon") {
-          $Env:CFLAGS = "-arch:NEON"
+          $env:CFLAGS = "-arch:NEON"
         }
-        ' || '
+
+    - name: Set SIMD flags (Unix)
+      if: runner.os != 'Windows'
+      shell: bash
+      run: |
         if [ "${{ matrix.simd }}" == "none" ]; then
           export CFLAGS=""
         elif [ "${{ matrix.simd }}" == "sse" ]; then
@@ -226,16 +230,16 @@ jobs:
         elif [ "${{ matrix.simd }}" == "neon" ]; then
           export CFLAGS="-mfpu=neon"
         fi
-        ' }}
 
-    - name: Configure CMake
-      shell: ${{ runner.os == 'Windows' && 'pwsh' || 'bash' }}
-      run: |
-        ${{ runner.os == 'Windows' && '
-        cmake -B build -G "Visual Studio 17 2022" -A x64 -T host=x64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="$Env:CFLAGS" -DCGLM_STATIC=ON -DCGLM_USE_TEST=ON
-        ' || '
-        cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="$CFLAGS" -DCGLM_STATIC=ON -DCGLM_USE_TEST=ON
-        ' }}
+    - name: Configure CMake (Windows)
+      if: runner.os == 'Windows'
+      shell: pwsh
+      run: cmake -B build -G "Visual Studio 17 2022" -A x64 -T host=x64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="$env:CFLAGS" -DCGLM_STATIC=ON -DCGLM_USE_TEST=ON
+
+    - name: Configure CMake (Unix)
+      if: runner.os != 'Windows'
+      shell: bash
+      run: cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="$CFLAGS" -DCGLM_STATIC=ON -DCGLM_USE_TEST=ON
 
     - name: Build
       run: cmake --build build