diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 11cca9af..274f4124 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -135,22 +135,17 @@ jobs: - name: Configure CMake run: | - cmake -E make_directory build cmake -E make_directory bin if [ ${{ matrix.arch }} == "x86" ]; then - cmake -S src -B build -G "Ninja" -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DUSE_SDL2=${{ matrix.use_sdl }} -DBUILD_ETMAIN_MOD=ON -DCMAKE_TOOLCHAIN_FILE=../src/cmake/toolchains/linux-i686.cmake -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/bin + cmake -S src -B bin -G "Ninja" -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DUSE_SDL2=${{ matrix.use_sdl }} -DBUILD_ETMAIN_MOD=ON -DCMAKE_TOOLCHAIN_FILE=../src/cmake/toolchains/linux-i686.cmake else - cmake -S src -B build -G "Ninja" -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DUSE_SDL2=${{ matrix.use_sdl }} -DBUILD_ETMAIN_MOD=ON -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/bin + cmake -S src -B bin -G "Ninja" -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DUSE_SDL2=${{ matrix.use_sdl }} -DBUILD_ETMAIN_MOD=ON fi - name: Build - working-directory: build + working-directory: bin run: cmake --build . --config ${{ matrix.config }} --parallel - - name: Install - working-directory: build - run: cmake --install . - - uses: actions/upload-artifact@v4 if: matrix.config == 'Release' with: @@ -187,18 +182,13 @@ jobs: - name: Configure CMake run: | - cmake -E make_directory build cmake -E make_directory bin - cmake -S src -B build -G "Ninja" -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DUSE_SDL2=TRUE -DBUILD_ETMAIN_MOD=ON -DUSE_SYSTEM_JPEG=OFF -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/bin + cmake -S src -B bin -G "Ninja" -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DUSE_SDL2=TRUE -DBUILD_ETMAIN_MOD=ON -DUSE_SYSTEM_JPEG=OFF - name: Build - working-directory: build + working-directory: bin run: cmake --build . --config ${{ matrix.config }} --parallel - - name: Install - working-directory: build - run: cmake --install . - - uses: actions/upload-artifact@v4 if: matrix.config == 'Release' with: