diff --git a/.github/workflows/linux_meson_x86.yml b/.github/workflows/linux_meson.yml similarity index 91% rename from .github/workflows/linux_meson_x86.yml rename to .github/workflows/linux_meson.yml index aa35d16..f4384ae 100644 --- a/.github/workflows/linux_meson_x86.yml +++ b/.github/workflows/linux_meson.yml @@ -1,4 +1,4 @@ -name: linux_meson_x86 +name: Linux Meson on: repository_dispatch: @@ -16,23 +16,28 @@ jobs: matrix: os: [ubuntu-24.04] arch: [x86_64] + runs-on: ${{ matrix.os }} if: "!contains(github.event.head_commit.message, 'ci skip')" + steps: - name: Checkout repository uses: actions/checkout@v6 - - uses: NcStudios/VulkanCI@v1.2 + - name: Install system dependencies run: | sudo apt-get update sudo apt-get -y install mesa-common-dev clang libsdl2-2.0-0 libsdl2-dev build-essential libvulkan-dev + - name: Python uses: actions/setup-python@v5 with: python-version: '3.11' + - name: Install Meson with pip run: sudo pip3 install meson + - name: Build with meson run: | meson build --prefix=$PWD/ --bindir='' --libdir='' - ninja install -C build \ No newline at end of file + ninja install -C build diff --git a/.github/workflows/macos_meson_arm.yml b/.github/workflows/macos_meson.yml similarity index 90% rename from .github/workflows/macos_meson_arm.yml rename to .github/workflows/macos_meson.yml index 0fabe40..2703341 100644 --- a/.github/workflows/macos_meson_arm.yml +++ b/.github/workflows/macos_meson.yml @@ -1,4 +1,4 @@ -name: macOS_meson_arm +name: MacOS Meson on: repository_dispatch: @@ -15,22 +15,28 @@ jobs: fail-fast: false matrix: os: [macOS-latest] - arch: [arm] + arch: [x86_64, arm] + runs-on: ${{ matrix.os }} if: "!contains(github.event.head_commit.message, 'ci skip')" + steps: - name: Checkout repository uses: actions/checkout@v6 + - name: Install system dependencies run: | brew install SDL2 + - name: Python uses: actions/setup-python@v5 with: python-version: '3.11' + - name: Install Meson with pip run: sudo pip3 install meson + - name: Build with meson run: | meson build --prefix=$PWD/ --bindir='' --libdir='' - ninja install -C build \ No newline at end of file + ninja install -C build diff --git a/.github/workflows/macos_meson_x86.yml b/.github/workflows/macos_meson_x86.yml deleted file mode 100644 index a90a9ca..0000000 --- a/.github/workflows/macos_meson_x86.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: macOS_meson_x86 - -on: - repository_dispatch: - types: [create-pull-request] - pull_request: - push: - paths-ignore: - - '.gitignore' - - 'LICENSE' - - 'README.md' -jobs: - build: - strategy: - fail-fast: false - matrix: - os: [macOS-latest] - arch: [x86_64] - runs-on: ${{ matrix.os }} - if: "!contains(github.event.head_commit.message, 'ci skip')" - steps: - - name: Checkout repository - uses: actions/checkout@v6 - - name: Install system dependencies - run: | - brew install SDL2 - - name: Python - uses: actions/setup-python@v5 - with: - python-version: '3.11' - - name: Install Meson with pip - run: sudo pip3 install meson - - name: Build with meson - run: | - meson build --prefix=$PWD/ --bindir='' --libdir='' - ninja install -C build \ No newline at end of file