From 39210af3e59c929cba6de2d39ef1c32835f6388b Mon Sep 17 00:00:00 2001 From: Mikaƫl Capelle Date: Thu, 29 May 2025 11:04:36 +0200 Subject: Move to VCPKG (#2068) * Remove SConscript related files. * Force-load translations from uibase and gamebryo/creation. * Bring githubpp here and add a standalone preset. * Switch VersionInfo -> Version for ModOrganizer2. (#2063) * Add pre-commit hook. * Use 7zip build from VCPKG registry. * Use archive.dll from the bin folder instead of dlls. --- .github/workflows/build.yml | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 17bac3ba..7634d463 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,35 +2,32 @@ name: Build ModOrganizer 2 on: push: - branches: master + branches: [master] pull_request: types: [opened, synchronize, reopened] env: - VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" + VCPKG_BINARY_SOURCES: clear;x-azblob,${{ vars.AZ_BLOB_VCPKG_URL }},${{ secrets.AZ_BLOB_SAS }},readwrite jobs: build: runs-on: windows-2022 steps: - # https://learn.microsoft.com/en-us/vcpkg/consume/binary-caching-github-actions-cache - - name: Export GitHub Actions cache environment variables - uses: actions/github-script@v7 + - name: Build ModOrganizer + id: build-modorganizer + uses: ModOrganizer2/build-with-mob-action@master with: - script: | - core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); - core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); + qt-modules: qtpositioning qtwebchannel qtwebengine qtwebsockets + mo2-dependencies: usvfs uibase bsatk esptk archive lootcli - - name: "Set environmental variables" - shell: bash + - name: Install ModOrganizer + shell: pwsh run: | - echo "VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT" >> $GITHUB_ENV + cmake --install vsbuild --config RelWithDebInfo + working-directory: ./build/${{ github.event.repository.name }} - - name: Build ModOrganizer 2 - uses: ModOrganizer2/build-with-mob-action@master + - name: Package ModOrganizer + uses: actions/upload-artifact@master with: - qt-modules: qtpositioning qtwebchannel qtwebengine qtwebsockets - mo2-third-parties: - 7z zlib gtest libbsarch libloot openssl bzip2 python lz4 spdlog - boost boost-di sip pyqt pybind11 ss licenses explorerpp DirectXTex - mo2-dependencies: usvfs cmake_common uibase githubpp bsatk esptk archive lootcli game_gamebryo + name: modorganizer + path: ./install/bin -- cgit v1.3.1