2
0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-09-12 19:47:27 +00:00

Merge pull request #514 from Laupetin/fix/linux-version

fix: linux version
This commit is contained in:
Jan
2025-09-09 23:04:27 +02:00
committed by GitHub
2 changed files with 13 additions and 2 deletions

View File

@@ -15,6 +15,9 @@ jobs:
build_arch: [x86, x64] build_arch: [x86, x64]
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: ubuntu:24.04 container: ubuntu:24.04
defaults:
run:
shell: bash
steps: steps:
- name: Install g++ and multilib - name: Install g++ and multilib
run: | run: |
@@ -38,7 +41,9 @@ jobs:
- name: Build - name: Build
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
run: make -C build -j$(nproc) config=release_${{ matrix.build_arch }} all run: |
make -C build -j$(nproc) config=release_${{ matrix.build_arch }} all
chmod +x build/bin/Release_${{ matrix.build_arch }}/{ImageConverter,Unlinker,Linker}
- 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

View File

@@ -9,6 +9,9 @@ jobs:
build-release-linux: build-release-linux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: ubuntu:24.04 container: ubuntu:24.04
defaults:
run:
shell: bash
steps: steps:
- name: Install g++ and multilib - name: Install g++ and multilib
run: | run: |
@@ -23,6 +26,7 @@ jobs:
uses: actions/checkout@v5 uses: actions/checkout@v5
with: with:
submodules: recursive submodules: recursive
fetch-tags: true
- name: Premake generate - name: Premake generate
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
@@ -32,7 +36,9 @@ jobs:
- name: Build - name: Build
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
run: make -C build -j$(nproc) config=release_x86 all run: |
make -C build -j$(nproc) config=release_x86 all
chmod +x build/bin/Release_${{ matrix.build_arch }}/{ImageConverter,Unlinker,Linker}
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4