Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 0 additions & 113 deletions .github/release.yml

This file was deleted.

62 changes: 62 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
name: Build

on:
pull_request:
types: [synchronize, opened, reopened, ready_for_review]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
windows:
runs-on: windows-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 1

- name: Set up Ninja
uses: seanmiddleditch/gha-setup-ninja@v4

- name: Set up CMake
uses: jwlawson/actions-setup-cmake@v2

- name: Configure
run: cmake -S . -B build -G Ninja

- name: Build
run: cmake --build build --config Release

ubuntu:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 1

- name: Set up Ninja
uses: seanmiddleditch/gha-setup-ninja@v4

- name: Set up CMake
uses: jwlawson/actions-setup-cmake@v2

- name: install xcb dep
run: |
sudo apt-get update
sudo apt-get install libxcb1-dev -y

- name: install GL libraries
run: |
sudo apt-get update
sudo apt-get install libgl1-mesa-dev libegl1-mesa-dev -y

- name: Configure
run: cmake -S . -B build -G Ninja

- name: Build
run: cmake --build build --config Release
16 changes: 9 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build and Release
name: Release

on:
push:
Expand All @@ -12,6 +12,9 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 1

- name: Set up Ninja
uses: seanmiddleditch/gha-setup-ninja@v4
Expand Down Expand Up @@ -42,6 +45,9 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 1

- name: Set up Ninja
uses: seanmiddleditch/gha-setup-ninja@v4
Expand All @@ -52,12 +58,8 @@ jobs:
- name: Get version
id: get_version
run: |
$version = $(python ./.github/release.py --version)
$sha1 = $(python ./.github/release.py --sha1)
$version_sha1 = $(python ./.github/release.py --version --sha1)
echo "version=$version" >> $env:GITHUB_OUTPUT
echo "sha1=sha1" >> $env:GITHUB_OUTPUT
echo "version_sha1=$version_sha1" >> $env:GITHUB_OUTPUT
version_sha1=$(python3 .github/release.py --version --sha1)
echo "version_sha1=$version_sha1" >> $GITHUB_OUTPUT

- name: Configure
run: cmake -S . -B build -G Ninja
Expand Down
1 change: 0 additions & 1 deletion extern/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ add_subdirectory(SPIRV-Cross)

set_target_properties(
assimp
UpdateAssimpLibsDebugSymbolsAndDLLs
zlibstatic
glslang
GenericCodeGen
Expand Down
Loading