Correct environment var, fix formatting

CommitteeOfZero · Oct 5, 2024 · 2584fd0 · 2584fd0
1 parent 199cad7
commit 2584fd0
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -90,8 +90,8 @@ jobs:
     - name: Setup Android Environment
       if: matrix.os_name == 'android'
       run: |
-        echo "CC=$NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=aarch64-linux-android21"
-        echo "VULKAN_SDK=$ANDROID_NDK_HOME/sysroot/usr"
+        echo "CC=$NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=aarch64-linux-android21" >> $GITHUB_ENV
+        echo "VULKAN_SDK=$ANDROID_NDK_HOME/sysroot/usr" >> $GITHUB_ENV
       shell: bash
     - name: Download Switch deps
       if: matrix.os_name == 'switch'
@@ -154,12 +154,16 @@ jobs:
       with:
         cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
         configurePreset: ci-release
-        configurePresetAdditionalArgs: >
-          ['-DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }}', 
-            '-DVCPKG_HOST_TRIPLET=${{ matrix.host_triplet }}', 
+        configurePresetAdditionalArgs: >-
+          [
+            '-DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }}',
+            '-DVCPKG_HOST_TRIPLET=${{ matrix.host_triplet }}',
             '-DVCPKG_BUILD_TYPE=release'
-            ${{ ((matrix.os_name == 'android') && ', ''-DCMAKE_TOOLCHAIN_FILE=$NDK/build/cmake/android.toolchain.cmake'', ''-DANDROID_ABI=$ABI'', ''-DANDROID_PLATFORM=android-$MINSDKVERSION''') || '' }}
-          ']' 
+            ${{ (matrix.os_name == 'android') && ',
+            "-DCMAKE_TOOLCHAIN_FILE=$NDK/build/cmake/android.toolchain.cmake",
+            "-DANDROID_ABI=$ABI",
+            "-DANDROID_PLATFORM=android-$MINSDKVERSION"' || '' }}
+          ]
         buildPreset: CI-Build
 
     - name: Run Switch build