From 599749a79918fe481c3bbfb71a81f11726fa332c Mon Sep 17 00:00:00 2001 From: acidicoala <67734819+acidicoala@users.noreply.github.com> Date: Sun, 5 Oct 2025 18:46:31 +0500 Subject: [PATCH] Use docker container in CI --- .github/workflows/build.yml | 4 +-- .github/workflows/kb-build.yml | 59 +++++++++++++++++++++------------- .idea/dictionaries/project.xml | 1 + KoalaBox | 2 +- 4 files changed, 41 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2a8567f..3f3be68 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,9 +1,9 @@ -name: 🏗️ Build +name: 🏗️ Project Build on: push jobs: build: - name: 🏗️ Build + name: 🏗️ Project Build uses: acidicoala/SmokeAPI/.github/workflows/kb-build.yml@master with: #language=json diff --git a/.github/workflows/kb-build.yml b/.github/workflows/kb-build.yml index ad11524..49da94a 100644 --- a/.github/workflows/kb-build.yml +++ b/.github/workflows/kb-build.yml @@ -21,7 +21,9 @@ jobs: build: name: ${{ matrix.module }}-${{ matrix.os }}-${{ matrix.bitness }} runs-on: ${{ matrix.runner }} + container: ${{ matrix.container }} strategy: + fail-fast: false matrix: module: ${{ fromJson(inputs.module) }} os: ${{ fromJson(inputs.os) }} @@ -37,7 +39,9 @@ jobs: # Compiler - os: Linux - compiler: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ + compiler: > + -DCMAKE_C_COMPILER=clang + -DCMAKE_CXX_COMPILER=clang++ # Architecture flags - os: Windows @@ -50,11 +54,18 @@ jobs: - os: Linux bitness: 32 - arch: -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_EXE_LINKER_FLAGS="-m32 -L/usr/lib/i386-linux-gnu" -DCMAKE_PREFIX_PATH=/usr/lib/i386-linux-gnu + arch: > + -DCMAKE_C_FLAGS=-m32 + -DCMAKE_CXX_FLAGS=-m32 + -DCMAKE_EXE_LINKER_FLAGS="-m32 -L/usr/lib/i386-linux-gnu" + -DCMAKE_PREFIX_PATH=/usr/lib/i386-linux-gnu - os: Linux bitness: 64 - arch: -DCMAKE_C_FLAGS=-m64 -DCMAKE_CXX_FLAGS=-m64 -DCMAKE_EXE_LINKER_FLAGS=-m64 + arch: > + -DCMAKE_C_FLAGS=-m64 + -DCMAKE_CXX_FLAGS=-m64 + -DCMAKE_EXE_LINKER_FLAGS=-m64 # Output paths - os: Windows @@ -63,30 +74,34 @@ jobs: - os: Linux output: '*.so' + # Container + - os: Linux + container: ghcr.io/acidicoala/koalabox:master@sha256:fd79048173e2fd77838ac34066c5ec5320930fbc436df1cff549cf11cd6e2454 + env: BUILD_DIR: ${{ github.workspace }}/build steps: - - name: '🛠️ Install dependencies' - if: ${{ matrix.os == 'Linux' }} - run: | - if [ "${{ matrix.bitness }}" = "32" ]; then - sudo dpkg --add-architecture i386 - deps="libbrotli-dev:i386 libzstd-dev:i386 libssl-dev:i386 gcc-multilib g++-multilib" - else - deps="libbrotli-dev libzstd-dev" - fi - deps="$deps libgtk-3-dev gcc" - - sudo apt update - sudo rm /var/lib/man-db/auto-update - sudo apt install $deps +# - name: '🛠️ Install dependencies' +# if: ${{ matrix.os == 'Linux' }} +# run: | +# if [ "${{ matrix.bitness }}" = "32" ]; then +# sudo dpkg --add-architecture i386 +# deps="libbrotli-dev:i386 libzstd-dev:i386 libssl-dev:i386 gcc-multilib g++-multilib" +# else +# deps="libbrotli-dev libzstd-dev" +# fi +# deps="$deps libgtk-3-dev gcc" +# +# sudo apt update +# sudo rm /var/lib/man-db/auto-update +# sudo apt install $deps - - name: '🛠️ Install LLVM and Clang' - if: ${{ matrix.os == 'Linux' }} - uses: KyleMayes/install-llvm-action@v2 - with: - version: "20.1" +# - name: '🛠️ Install LLVM and Clang' +# if: ${{ matrix.os == 'Linux' }} +# uses: KyleMayes/install-llvm-action@v2 +# with: +# version: "20.1" - name: '🛠️ Check compiler versions' if: ${{ matrix.os == 'Linux' }} diff --git a/.idea/dictionaries/project.xml b/.idea/dictionaries/project.xml index b354337..9ee9b29 100644 --- a/.idea/dictionaries/project.xml +++ b/.idea/dictionaries/project.xml @@ -11,6 +11,7 @@ dynsym elfio endfor + ghcr indicies inja inlinentd diff --git a/KoalaBox b/KoalaBox index cd6bb51..5c2d477 160000 --- a/KoalaBox +++ b/KoalaBox @@ -1 +1 @@ -Subproject commit cd6bb51fdeb90636feeb7dc08a5f1a6b289161ea +Subproject commit 5c2d477c5f3368f0d7b43b70997265077b6d0882