diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3462963..d161591 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,8 +76,13 @@ jobs: chmod +x ./linux/get-dependencies.sh ./linux/get-dependencies.sh - - name: Set build type - run: echo "BUILD_TYPE=Release" >> $GITHUB_ENV + - name: Set build variables + shell: bash + run: | + echo "BUILD_TYPE=Release" >> $GITHUB_ENV + echo "DEVEL=true" >> $GITHUB_ENV + echo "USE_WEBENGINE=false" >> $GITHUB_ENV + echo "USE_MULTIMEDIA=true" >> $GITHUB_ENV - name: Get Variables and Clone uses: ./.github/workflows/clone @@ -86,17 +91,14 @@ jobs: shell: bash run: | cd eden - if [ "${{ matrix.arch }}" = 'aarch64' ] || [ "${{ matrix.arch }}" = 'armv9' ]; then - sed -i 's/Settings::values\.lru_cache_enabled\.GetValue()/true/' src/core/arm/nce/patcher.h - fi - TARGET=appimage DEVEL=true ./.ci/linux/build.sh ${{ matrix.arch }} $(nproc) + TARGET=appimage ./.ci/linux/build.sh ${{ matrix.arch }} $(nproc) - name: Package shell: bash run: | cd eden - DEVEL=true ./.ci/linux/package.sh ${{ matrix.arch }} + ./.ci/linux/package.sh ${{ matrix.arch }} - name: Upload artifacts uses: actions/upload-artifact@v4.6.2 @@ -116,7 +118,7 @@ jobs: arch: amd64 qt_arch: win64_msvc2022_64 qt_version: 6.9.1 - qt_modules: qtmultimedia qtwebengine qtpositioning qtwebchannel + qt_modules: qtmultimedia qt5compat # - runs-on: windows-11-arm # arch: arm64 @@ -135,9 +137,13 @@ jobs: modules: ${{ matrix.qt_modules }} cache: 'true' - - name: Set build type + - name: Set build variables shell: bash - run: echo "BUILD_TYPE=Release" >> $GITHUB_ENV + run: | + echo "BUILD_TYPE=Release" >> $GITHUB_ENV + echo "DEVEL=true" >> $GITHUB_ENV + echo "USE_WEBENGINE=false" >> $GITHUB_ENV + echo "USE_MULTIMEDIA=true" >> $GITHUB_ENV - name: Get Variables and Clone uses: ./.github/workflows/clone @@ -169,7 +175,6 @@ jobs: run: | cd eden export PATH="${PATH}:${{ runner.workspace }}/Qt/${{ matrix.qt_version }}/${{ matrix.qt_arch }}/bin" - export DEVEL=true export WINDEPLOYQT=windeployqt ./.ci/windows/build.sh diff --git a/linux/get-dependencies.sh b/linux/get-dependencies.sh index 6b9e622..169b238 100755 --- a/linux/get-dependencies.sh +++ b/linux/get-dependencies.sh @@ -36,10 +36,10 @@ pacman -Syu --noconfirm \ nlohmann-json \ patchelf \ python-pip \ + qt6-5compat \ qt6-multimedia \ qt6-tools \ qt6-wayland \ - qt6-webengine \ sdl2 \ spirv-headers \ strace \