From 92689d124ab89acd4de71224c3870a5ed19b3be9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= Date: Mon, 10 Jul 2023 19:04:09 +0200 Subject: [PATCH] Switch to generic mob action. --- .github/workflows/build.yml | 72 +++++------------------------------ .github/workflows/linting.yml | 7 +++- 2 files changed, 15 insertions(+), 64 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1fcaa364d..098a8d852 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,74 +1,20 @@ name: Build ModOrganizer 2 + on: push: branches: master pull_request: types: [opened, synchronize, reopened] + jobs: build: runs-on: windows-2022 steps: - - name: Checkout mob - uses: actions/checkout@master + - name: Build ModOrganizer 2 + 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: Cache dependencies - id: cache-dependencies - uses: actions/cache@v3 - with: - # TODO: finer cache - path: | - ./install - ./build - 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 - 7z zlib fmt gtest libbsarch libloot openssl libffi bzip2 python lz4 spdlog - boost boost-di sip pyqt pybind11 ss licenses explorerpp usvfs - - name: Build dependencies log - uses: actions/upload-artifact@v3 - with: - name: build-dependencies-log - path: | - mob.log - # TODO: cache this? - - name: Build cmake_common and uibase - run: .\mob\mob.exe -l 4 -d . build - --ignore-uncommitted-changes - --redownload --reextract --reconfigure --rebuild - cmake_common uibase - # TODO: cache this? - - name: Build ModOrganizer dependencies - run: .\mob\mob.exe -l 4 -d . build - --ignore-uncommitted-changes - --redownload --reextract --reconfigure --rebuild - githubpp bsatk esptk archive lootcli game_gamebryo - - uses: actions/checkout@v3 - with: - path: ./build/modorganizer_super/modorganizer - - name: Build ModOrganizer - run: .\mob\mob.exe -l 5 -d . build --no-fetch-task --no-pull modorganizer + qt-modules: qtpositioning qtwebchannel qtwebengine qtwebsockets + mo2-third-parties: + 7z zlib fmt gtest libbsarch libloot openssl libffi bzip2 python lz4 spdlog + boost boost-di sip pyqt pybind11 ss licenses explorerpp usvfs + mo2-dependencies: cmake_common uibase githubpp bsatk esptk archive lootcli game_gamebryo diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 994276932..43cdeeaed 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -1,5 +1,10 @@ name: Lint ModOrganizer 2 -on: [push] + +on: + push: + pull_request: + types: [opened, synchronize, reopened] + jobs: lint: runs-on: ubuntu-latest