From 85227b91ce0217ebf23d9b59f77351ac59ee8df6 Mon Sep 17 00:00:00 2001 From: Ensiform Date: Thu, 7 Mar 2024 21:12:50 -0600 Subject: [PATCH] Try to cleanup the linux and macos zips from recent commit --- .github/workflows/ci.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0c51ee68..01afa8c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -135,17 +135,22 @@ jobs: - name: Configure CMake run: | + cmake -E make_directory build cmake -E make_directory bin if [ ${{ matrix.arch }} == "x86" ]; then - 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 + 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 else - cmake -S src -B bin -G "Ninja" -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DUSE_SDL2=${{ matrix.use_sdl }} -DBUILD_ETMAIN_MOD=ON + 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 fi - name: Build - working-directory: bin + working-directory: build 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: @@ -180,13 +185,18 @@ jobs: - name: Configure CMake run: | + cmake -E make_directory build cmake -E make_directory bin - cmake -S src -B bin -G "Ninja" -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DUSE_SDL2=TRUE -DBUILD_ETMAIN_MOD=ON -DUSE_SYSTEM_JPEG=OFF + 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 - name: Build - working-directory: bin + working-directory: build 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: