2
0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-03-16 09:53:04 +00:00

fix: release ci pipeline broken

This commit is contained in:
Jan Laupetin
2026-03-14 16:53:04 +01:00
parent 8376bea762
commit a613cb0f8b
2 changed files with 12 additions and 8 deletions

View File

@@ -77,7 +77,7 @@ jobs:
[[ "${{ matrix.build_arch }}" == "x86" ]] && export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig:$PKG_CONFIG_PATH || true [[ "${{ matrix.build_arch }}" == "x86" ]] && export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig:$PKG_CONFIG_PATH || true
echo "Package config path: $PKG_CONFIG_PATH" echo "Package config path: $PKG_CONFIG_PATH"
scripts/build.sh release ${{ matrix.build_arch }} scripts/build.sh release ${{ matrix.build_arch }}
chmod +x build/bin/Release_${{ matrix.build_arch }}/{ImageConverter,Unlinker,Linker} chmod +x build/bin/Release_${{ matrix.build_arch }}/{ModMan,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

@@ -13,23 +13,25 @@ jobs:
run: run:
shell: bash shell: bash
steps: steps:
- name: Enable i386 architecture
run: dpkg --add-architecture i386
- name: Install base packages - name: Install base packages
run: | run: |
apt-get update apt-get update
apt-get install -y wget tar git make curl apt-get install -y wget tar git make curl
- name: Configure gcc
if: ${{ matrix.toolset == 'gcc' }}
uses: ./.github/actions/configure-gcc
with:
gcc_version: 14
enable_x86: "true"
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v6 uses: actions/checkout@v6
with: with:
submodules: recursive submodules: recursive
- name: Configure gcc
uses: ./.github/actions/configure-gcc
with:
gcc_version: 14
enable_x86: "true"
- name: Premake generate - name: Premake generate
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
env: env:
@@ -39,6 +41,8 @@ jobs:
- name: Build - name: Build
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
run: | run: |
export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig:$PKG_CONFIG_PATH
echo "Package config path: $PKG_CONFIG_PATH"
scripts/build.sh release x86 scripts/build.sh release x86
chmod +x build/bin/Release_x86/{ImageConverter,Unlinker,Linker} chmod +x build/bin/Release_x86/{ImageConverter,Unlinker,Linker}