From 40a2bdafcb4af54c4049f2da34b57e9bad0609bb Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Fri, 10 Oct 2025 00:49:20 +0200 Subject: [PATCH] chore: do not compile modman x86 on linux --- .github/workflows/ci.yaml | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c35c64e9..861fe993 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,6 +13,11 @@ jobs: strategy: matrix: build_arch: [x86, x64] + include: + - build_arch: x86 + additional_packages: gcc-13-multilib g++-13-multilib + - build_arch: x64 + premake_flags: --modman runs-on: ubuntu-latest container: ubuntu:24.04 defaults: @@ -22,19 +27,16 @@ jobs: - name: Install g++ and multilib run: | apt-get update - apt-get install -y wget tar git make curl gcc-13 g++-13 gcc-13-multilib g++-13-multilib libgtk-4-dev libwebkitgtk-6.0-dev + apt-get install -y wget tar git make curl gcc-13 g++-13 libgtk-4-dev libwebkitgtk-6.0-dev ${{ matrix.additional_packages }} update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 13 update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 13 update-alternatives --set gcc /usr/bin/gcc-13 update-alternatives --set g++ /usr/bin/g++-13 - name: Install node - run: | - export NVM_DIR=/root/.nvm - export NODE_VERSION=22 - mkdir -p $NVM_DIR - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/refs/heads/master/install.sh | bash - source $NVM_DIR/nvm.sh && nvm install $NODE_VERSION + uses: actions/setup-node@v5 + with: + node-version: 24 - name: Checkout repository uses: actions/checkout@v5 @@ -45,13 +47,11 @@ jobs: working-directory: ${{ github.workspace }} env: PREMAKE_NO_PROMPT: 1 - run: ./generate.sh --modman + run: ./generate.sh ${{ matrix.premake_flags }} - name: Build working-directory: ${{ github.workspace }} run: | - export NVM_DIR=/root/.nvm - source $NVM_DIR/nvm.sh npm --prefix src/ModManUi install npm --prefix src/ModManUi run build make -C build -j$(nproc) config=release_${{ matrix.build_arch }} all @@ -60,8 +60,6 @@ jobs: - name: Lint working-directory: ${{ github.workspace }} run: | - export NVM_DIR=/root/.nvm - source $NVM_DIR/nvm.sh npm --prefix src/ModManUi run lint - name: Test @@ -86,14 +84,19 @@ jobs: msbuild_config: x64 runs-on: windows-latest steps: + - name: Install node + uses: actions/setup-node@v5 + with: + node-version: 24 + + - name: Add MSBuild to PATH + uses: microsoft/setup-msbuild@v2.0.0 + - name: Checkout repository uses: actions/checkout@v5 with: submodules: recursive - - name: Add MSBuild to PATH - uses: microsoft/setup-msbuild@v2.0.0 - - name: Premake generate working-directory: ${{ github.workspace }} env: @@ -107,6 +110,11 @@ jobs: npm --prefix src/ModManUi run build msbuild /m /p:Configuration=Release /p:Platform=${{ matrix.msbuild_config }} build + - name: Lint + working-directory: ${{ github.workspace }} + run: | + npm --prefix src/ModManUi run lint + - name: Test working-directory: ${{ github.workspace }}/build/lib/Release_${{ matrix.build_arch }}/tests run: |