From be9b614a5ee5e527cbd792ff790c4329c24f9a11 Mon Sep 17 00:00:00 2001
From: Mikael CAPELLE <mikael.capelle@thalesaleniaspace.com>
Date: Mon, 10 Jul 2023 09:32:09 +0200
Subject: [PATCH] Fix build workflow.

---
 .github/workflows/build-and-test.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 8c93181..84a3e14 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -1,9 +1,14 @@
 name: Build Plugin Python
+
 on:
   push:
     branches: master
   pull_request:
     types: [opened, synchronize, reopened]
+
+env:
+  MO_BRANCH: ${{ github.head_ref || github.ref_name }}
+
 jobs:
   build:
     runs-on: windows-2022
@@ -23,7 +28,7 @@ jobs:
           key: ${{ runner.OS }}-mob-cache-${{ hashFiles('mob/.git/refs/heads/master') }}
           restore-keys: |
             ${{ runner.OS }}-mob-cache-
-      - if: ${{ steps.cache-mob.outputs.cache-hit != 'true' }}
+      - if: steps.cache-mob.outputs.cache-hit != 'true'
         name: Build mob
         run: .\mob\bootstrap.ps1
       - name: Install Qt
@@ -44,7 +49,7 @@ jobs:
           key: ${{ runner.OS }}-mo2-dependencies-${{ hashFiles('mob/.git/refs/heads/master') }}
           restore-keys: |
             ${{ runner.OS }}-mo2-dependencies-
-      - if: ${{ steps.cache-dependencies.outputs.cache-hit != 'true' }}
+      - if: steps.cache-dependencies.outputs.cache-hit != 'true'
         name: Build dependencies with mob
         run: .\mob\mob.exe
           -l 4 -d .
@@ -58,7 +63,9 @@ jobs:
             mob.log
       # TODO: cache this?
       - name: Build cmake_common and uibase
-        run: .\mob\mob.exe -l 4 -d . build
+        run: .\mob\mob.exe -l 4 -d .
+          -s task/mo_fallback=master -s task/mo_branch=${{ env.MO_BRANCH }}
+          build
           --ignore-uncommitted-changes
           --redownload --reextract --reconfigure --rebuild
           cmake_common uibase