From d468d093bd66eaaa6483c7a8004a2f3f514423fd Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Tue, 5 Jan 2021 10:24:35 -0800 Subject: [PATCH] Update CI script --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1ccb6813e..298574972 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,6 +34,11 @@ jobs: haxelib install hxp --quiet haxelib git lime-samples https://github.com/openfl/lime-samples --quiet + - name: Install system dependencies (Linux) + if: ${{ startsWith(matrix.os, 'ubuntu-') }} + run: | + sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev g++-multilib gcc-multilib libasound2-dev libx11-dev libxext-dev libxi-dev libxrandr-dev libxinerama-dev + - name: Configure HXCPP compile cache (Linux/macOS) if: ${{ !startsWith(matrix.os, 'windows-') }} run: | @@ -44,11 +49,6 @@ jobs: run: | echo "HXCPP_COMPILE_CACHE=C:\.hxcpp" >> $GITHUB_ENV - - name: Install system dependencies (Linux) - if: ${{ startsWith(matrix.os, 'ubuntu-') }} - run: | - sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev g++-multilib gcc-multilib libasound2-dev libx11-dev libxext-dev libxi-dev libxrandr-dev libxinerama-dev - - name: Install "lime" command alias (Linux/macOS) if: ${{ !startsWith(matrix.os, 'windows-') }} run: | @@ -67,7 +67,7 @@ jobs: run: | mkdir -p ~/.android-ndk-r15c wget -O android-ndk.zip --quiet https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip - unzip -qq android-ndk.zip -d ~/.android-ndk-r15c + unzip -qq android-ndk.zip -d ~/.android-ndk-r15c/.. rm android-ndk.zip lime config ANDROID_SDK $ANDROID_HOME haxelib run lime config ANDROID_NDK_ROOT ~/.android-ndk-r15c