From 0b68e8e7dc768cf27e126d0c7250a63336ef492d Mon Sep 17 00:00:00 2001 From: Joseph Cloutier Date: Fri, 12 Jan 2024 16:56:02 -0500 Subject: [PATCH] CI: remove linux-ndll dependency from android-ndll. Not required, but it'll make the workflow summary neater. --- .github/workflows/main.yml | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c99b5b8bf7..594adb1b08 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -197,7 +197,6 @@ jobs: if-no-files-found: error android-ndll: - needs: linux-ndll runs-on: ubuntu-20.04 steps: @@ -237,25 +236,19 @@ jobs: - name: Rebuild Lime tools run: | haxelib dev lime ${{ github.workspace }} - haxelib run lime rebuild tools -nocolor -verbose -nocffi - haxelib run lime setup -alias -y -nocffi - - - uses: actions/download-artifact@v3 - with: - name: Mac64-NDLL - path: ndll/Mac64/ + haxelib run lime setup -alias -y -nocffi -eval - name: Configure Android support run: | - lime config ANDROID_SDK $ANDROID_HOME - lime config ANDROID_NDK_ROOT ${{ steps.setup-ndk.outputs.ndk-path }} - lime config JAVA_HOME $JAVA_HOME - lime config ANDROID_SETUP true - lime config + lime config ANDROID_SDK $ANDROID_HOME -eval + lime config ANDROID_NDK_ROOT ${{ steps.setup-ndk.outputs.ndk-path }} -eval + lime config JAVA_HOME $JAVA_HOME -eval + lime config ANDROID_SETUP true -eval + lime config -eval - name: Rebuild Lime (Android) run: | - lime rebuild android -release -nocolor -verbose -nocffi + lime rebuild android -release -nocolor -verbose -nocffi -eval - uses: actions/upload-artifact@v3 with: