zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-11-18 03:02:07 +00:00
Code Activity

chore: do not compile modman x86 on linux

Browse Source
This commit is contained in:
Jan Laupetin
2025-10-10 00:49:20 +02:00
parent b2e5464d38
commit 40a2bdafcb
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
.github/workflows/ci.yaml vendored
View File

@@ -13,6 +13,11 @@ jobs:
strategy: strategy:
matrix: matrix:
build_arch: [x86, x64] 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 runs-on: ubuntu-latest
container: ubuntu:24.04 container: ubuntu:24.04
defaults: defaults:
@@ -22,19 +27,16 @@ jobs:
- name: Install g++ and multilib - name: Install g++ and multilib
run: | run: |
apt-get update 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/gcc gcc /usr/bin/gcc-13 13
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-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 gcc /usr/bin/gcc-13
update-alternatives --set g++ /usr/bin/g++-13 update-alternatives --set g++ /usr/bin/g++-13
- name: Install node - name: Install node
run: | uses: actions/setup-node@v5
export NVM_DIR=/root/.nvm with:
export NODE_VERSION=22 node-version: 24
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
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v5 uses: actions/checkout@v5
@@ -45,13 +47,11 @@ jobs:
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
env: env:
PREMAKE_NO_PROMPT: 1 PREMAKE_NO_PROMPT: 1
run: ./generate.sh --modman run: ./generate.sh ${{ matrix.premake_flags }}
- name: Build - name: Build
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
run: | run: |
export NVM_DIR=/root/.nvm
source $NVM_DIR/nvm.sh
npm --prefix src/ModManUi install npm --prefix src/ModManUi install
npm --prefix src/ModManUi run build npm --prefix src/ModManUi run build
make -C build -j$(nproc) config=release_${{ matrix.build_arch }} all make -C build -j$(nproc) config=release_${{ matrix.build_arch }} all
@@ -60,8 +60,6 @@ jobs:
- name: Lint - name: Lint
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
run: | run: |
export NVM_DIR=/root/.nvm
source $NVM_DIR/nvm.sh
npm --prefix src/ModManUi run lint npm --prefix src/ModManUi run lint
- name: Test - name: Test
@@ -86,14 +84,19 @@ jobs:
msbuild_config: x64 msbuild_config: x64
runs-on: windows-latest runs-on: windows-latest
steps: 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 - name: Checkout repository
uses: actions/checkout@v5 uses: actions/checkout@v5
with: with:
submodules: recursive submodules: recursive
- name: Add MSBuild to PATH
uses: microsoft/setup-msbuild@v2.0.0
- name: Premake generate - name: Premake generate
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
env: env:
@@ -107,6 +110,11 @@ jobs:
npm --prefix src/ModManUi run build npm --prefix src/ModManUi run build
msbuild /m /p:Configuration=Release /p:Platform=${{ matrix.msbuild_config }} 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 - name: Test
working-directory: ${{ github.workspace }}/build/lib/Release_${{ matrix.build_arch }}/tests working-directory: ${{ github.workspace }}/build/lib/Release_${{ matrix.build_arch }}/tests
run: | run: |