From 42883f199a998022ab9ab899c4aecc5e880b6b50 Mon Sep 17 00:00:00 2001
From: Mikael CAPELLE <mikael.capelle@thalesaleniaspace.com>
Date: Mon, 10 Jul 2023 10:25:57 +0200
Subject: [PATCH 1/2] Switch to generic mob Github action.

---
 .github/workflows/build.yml | 57 +++----------------------------------
 1 file changed, 4 insertions(+), 53 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f4f4938a..23e14810 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,57 +8,8 @@ jobs:
   build:
     runs-on: windows-2022
     steps:
-      - name: Checkout mob
-        uses: actions/checkout@master
+      - name: Build UI Base
+        uses: ModOrganizer2/build-with-mob-action@master
         with:
-          repository: modorganizer2/mob
-          path: ./mob
-      - name: Cache mob
-        id: cache-mob
-        uses: actions/cache@v3
-        with:
-          path: |
-            ./mob/mob.exe
-          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' }}
-        name: Build mob
-        run: .\mob\bootstrap.ps1
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v3
-        with:
-          version: 6.5.1
-          modules: qtpositioning qtwebchannel qtwebengine qtwebsockets
-          cache: true
-      - name: Add Qt bins to PATH
-        run: echo "${QT_ROOT_DIR }/msvc2019_64/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-      - name: Cache dependencies
-        id: cache-dependencies
-        uses: actions/cache@v3
-        with:
-          path: |
-            ./build
-            !./build/modorganizer_super
-          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' }}
-        name: Build dependencies with mob
-        run: .\mob\mob.exe -l 4 -d . build fmt gtest spdlog boost
-      - name: Build dependencies log
-        uses: actions/upload-artifact@v3
-        with:
-          name: build-dependencies-log
-          path: |
-            mob.log
-      - name: Build cmake_common
-        run: .\mob\mob.exe -l 4 -d . build
-          --ignore-uncommitted-changes
-          --redownload --reextract --reconfigure --rebuild
-          cmake_common
-      - uses: actions/checkout@v3
-        with:
-          path: ./build/modorganizer_super/uibase
-      - name: Build UIBase
-        run: .\mob\mob.exe -l 5 -d . build --no-fetch-task --no-pull uibase
+          mo2-third-parties: fmt gtest spdlog boost
+          mo2-dependencies: cmake_common

From 8b25f2e16b9bec1522e50fd6f3ffec80248e4f74 Mon Sep 17 00:00:00 2001
From: Mikael CAPELLE <mikael.capelle@thalesaleniaspace.com>
Date: Mon, 10 Jul 2023 13:47:28 +0200
Subject: [PATCH 2/2] Run lint on PR too.

---
 .github/workflows/linting.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index 332cd772..db7c755e 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -1,5 +1,8 @@
 name: Lint UIBase
-on: [push]
+on:
+  push:
+  pull_request:
+    types: [opened, synchronize, reopened]
 jobs:
   lint:
     runs-on: ubuntu-latest