diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e741173..400f0015 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,8 +39,9 @@ jobs: matrix: image: - ubuntu:20.04 # LTS | CMake 3.16.3 | G++ 9.3.0 | QT 5.12.8 - - debian:11 # stable | CMake 3.18.4 | G++ 10.2.1 | QT 5.15.2 - ubuntu:22.04 # LTS | CMake 3.22.1 | G++ 11.2.0 | QT 5.15.3 + - debian:12 # stable | CMake 3.25.1 | G++ 12.2.0 | QT 5.15.8 + - ubuntu:24.04 # LTS | CMake 3.28.3 | G++ 13.2.0 | QT 5.15.13 steps: - name: Cancel Previous Runs @@ -52,8 +53,8 @@ jobs: apt-get update apt-get install -yqq --no-install-recommends --no-install-suggests \ ca-certificates build-essential cmake ninja-build git \ - libicu-dev libexpat1-dev qttools5-dev-tools qtbase5-dev-tools \ - qtbase5-dev qtmultimedia5-dev libqt5svg5-dev + libicu-dev libexpat1-dev libinih-dev qttools5-dev-tools \ + qtbase5-dev-tools qtbase5-dev qtmultimedia5-dev libqt5svg5-dev - name: Clone Repository uses: actions/checkout@v2 diff --git a/builds/flatpak/org.easyrpg.editor.yml b/builds/flatpak/org.easyrpg.editor.yml index 73eb92f2..371c897a 100644 --- a/builds/flatpak/org.easyrpg.editor.yml +++ b/builds/flatpak/org.easyrpg.editor.yml @@ -17,22 +17,36 @@ finish-args: # - --filesystem=home - --device=dri - --allow=devel +cleanup: + - /include + - /lib/cmake + - /lib/pkgconfig + - /lib/*.so modules: + # external libraries + - name: libinih + buildsystem: meson + config-opts: + - --buildtype=debugoptimized + sources: + - type: git + url: https://github.com/benhoyt/inih.git + tag: 58 + commit: 5cc5e2c24642513aaa5b19126aad42d0e4e0923e + # own libraries - name: liblcf buildsystem: cmake-ninja + builddir: true config-opts: - -DCMAKE_BUILD_TYPE=RelWithDebInfo - -DLIBLCF_ENABLE_TOOLS=OFF - -DLIBLCF_WITH_XML=OFF - -DLIBLCF_ENABLE_TESTS=OFF + - -DLIBLCF_UPDATE_MIMEDB=OFF sources: - type: git url: https://github.com/EasyRPG/liblcf.git - #tag: '0.7.0' cleanup: - - /include - - /lib/pkgconfig - - /lib/cmake - /share - name: editor buildsystem: cmake-ninja