Skip to content

Commit

Permalink
Revert to previous upload method completely
Browse files Browse the repository at this point in the history
  • Loading branch information
ensiform committed Mar 8, 2024
1 parent 854b79a commit 0ddb47b
Showing 1 changed file with 5 additions and 15 deletions.
20 changes: 5 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 0ddb47b

Please sign in to comment.