Skip to content

Commit

Permalink
update git before checkout
Browse files Browse the repository at this point in the history
  • Loading branch information
thatcosmonaut committed Oct 17, 2024
1 parent 170d0d8 commit fc9e80f
Showing 1 changed file with 27 additions and 27 deletions.
54 changes: 27 additions & 27 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ jobs:
container:
image: rockylinux/rockylinux:8
steps:
- uses: actions/checkout@v4
with:
submodules: true

- name: Are we really on Rocky Linux?
run: cat /etc/os-release

- name: Install dependencies
run: |
sudo dnf install ninja-build SDL2-devel
sudo dnf install git ninja-build SDL2-devel
- uses: actions/checkout@v4
with:
submodules: true

- name: CMake configure (Debug)
run: cmake -B debug -G Ninja . -DCMAKE_BUILD_TYPE=Debug
Expand Down Expand Up @@ -139,27 +139,27 @@ jobs:
cmake --build build --verbose -- -j`sysctl -n hw.ncpu`
linux-mingw:
name: Linux MinGW
name: Rocky Linux MinGW
runs-on: ubuntu-latest
container:
image: rockylinux/rockylinux:8
steps:
- name: Are we really on Rocky Linux?
run: cat /etc/os-release

- name: Install dependencies
run: |
sudo dnf install git ninja-build mingw32-gcc-c++ mingw64-gcc-c++
- uses: actions/checkout@v4
with:
submodules: true

- name: Are we really on Rocky Linux?
run: cat /etc/os-release

- name: Download SDL
run: |
curl -LO /~https://github.com/libsdl-org/SDL/releases/download/release-$SDL2_VERSION/SDL2-devel-$SDL2_VERSION-mingw.tar.gz
tar -xvf SDL2-devel-$SDL2_VERSION-mingw.tar.gz -C ${GITHUB_WORKSPACE}
- name: Install dependencies
run: |
sudo dnf install ninja-build mingw32-gcc-c++ mingw64-gcc-c++
- name: CMake configure 32-bit (Release)
run: cmake -B release-x86 -G Ninja . -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=.github/mingw-w64-i686.cmake -DSDL2_LIBRARIES=${GITHUB_WORKSPACE}/SDL2-$SDL2_VERSION/i686-w64-mingw32/bin/SDL2.dll -DSDL2_INCLUDE_DIRS=${GITHUB_WORKSPACE}/SDL2-$SDL2_VERSION/i686-w64-mingw32/include/SDL2

Expand All @@ -185,21 +185,21 @@ jobs:
path: release-x64/FAudio.dll

linux-SDL3:
name: Linux SDL3
name: Rocky Linux SDL3
runs-on: ubuntu-latest
container:
image: rockylinux/rockylinux:8
steps:
- uses: actions/checkout@v4
with:
submodules: true

- name: Are we really on Rocky Linux?
run: cat /etc/os-release

- name: Install dependencies
run: |
sudo dnf install ninja-build
sudo dnf install git ninja-build
- uses: actions/checkout@v4
with:
submodules: true

# This can be replaced by installing libsdl once Rocky ships SDL3
- name: Clone SDL3
Expand Down Expand Up @@ -271,27 +271,27 @@ jobs:
path: release/libFAudio.0.dylib

linux-mingw-SDL3:
name: Linux MinGW SDL3
name: Rocky Linux MinGW SDL3
runs-on: ubuntu-latest
container:
image: rockylinux/rockylinux:8
steps:
- name: Are we really on Rocky Linux?
run: cat /etc/os-release

- name: Install dependencies
run: |
sudo dnf install git ninja-build mingw32-gcc-c++ mingw64-gcc-c++
- uses: actions/checkout@v4
with:
submodules: true

- name: Are we really on Rocky Linux?
run: cat /etc/os-release

- name: Download SDL
run: |
curl -LO /~https://github.com/libsdl-org/SDL/releases/download/preview-$SDL3_VERSION/SDL3-devel-$SDL3_VERSION-mingw.tar.xz
tar -xvf SDL3-devel-$SDL3_VERSION-mingw.tar.xz -C ${GITHUB_WORKSPACE}
- name: Install dependencies
run: |
sudo dnf install ninja-build mingw32-gcc-c++ mingw64-gcc-c++
- name: CMake configure 32-bit (Release)
run: cmake -B release-x86 -G Ninja . -DBUILD_SDL3=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=.github/mingw-w64-i686.cmake -DSDL3_LIBRARIES=${GITHUB_WORKSPACE}/SDL3-$SDL3_VERSION/i686-w64-mingw32/bin/SDL3.dll -DSDL3_INCLUDE_DIRS=${GITHUB_WORKSPACE}/SDL3-$SDL3_VERSION/i686-w64-mingw32/include

Expand Down

0 comments on commit fc9e80f

Please sign in to comment.