From c2a0ca6307e1e04388d0c870b93627506a0cfea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= Date: Sun, 6 Jun 2021 18:18:35 +0200 Subject: [PATCH] fix hardcoded sdk version --- .github/workflows/jit.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/jit.yml b/.github/workflows/jit.yml index 220b77e..f157783 100644 --- a/.github/workflows/jit.yml +++ b/.github/workflows/jit.yml @@ -154,22 +154,24 @@ jobs: SDK_FILENAME=${{ matrix.config.sdk }} curl -L -O "https://github.com/ossia/score/releases/download/continuous/$SDK_FILENAME" mkdir -p "$HOME/Documents/ossia score library/SDK" - unzip -qq "$SDK_FILENAME" -d "$HOME/Documents/ossia score library/SDK/3.0.0-a38" + unzip -qq "$SDK_FILENAME" -d "sdk" - name: Compile if: matrix.config.name == 'macOS' shell: bash run: | + export SCORE_JIT_SDK="$PWD/sdk/usr" SCORE_FILENAME=/Volumes/score/score.app/Contents/MacOS/score - $SCORE_FILENAME --no-gui --compile-addon $PWD + $SCORE_FILENAME --no-gui --compile-addon "$PWD" - name: Compile if: matrix.config.name == 'Windows' - shell: cmd + shell: bash run: | - set QT_FORCE_STDERR_LOGGING=1 - set QT_ASSUME_STDERR_HAS_CONSOLE=1 - score.exe --no-gui --compile-addon "%cd%" + export SCORE_JIT_SDK="$PWD/sdk/usr" + export QT_FORCE_STDERR_LOGGING=1 + export QT_ASSUME_STDERR_HAS_CONSOLE=1 + ./score.exe --no-gui --compile-addon "$PWD" - name: Compile if: matrix.config.name == 'Ubuntu' @@ -177,5 +179,6 @@ jobs: run: | sudo apt -y install xvfb libasound2 libxcb1 libglvnd0 libx11-6 libxcb-glx0 libgl1 libdbus-1-3 libxcb-xkb1 libxkbcommon-x11-0 libxcb-xkb1 SCORE_FILENAME=ossia.score-master-${{ matrix.config.score }} + export SCORE_JIT_SDK="$PWD/sdk/usr" chmod +x $SCORE_FILENAME - xvfb-run --auto-servernum ./$SCORE_FILENAME --no-gui --compile-addon $PWD + xvfb-run --auto-servernum ./$SCORE_FILENAME --no-gui --compile-addon "$PWD"