Skip to content

Commit

Permalink
Merge branch 'master' into nix/texture-animation
Browse files Browse the repository at this point in the history
  • Loading branch information
NixAJ committed Mar 27, 2024
2 parents bd1b9e5 + 0f89f17 commit ec764da
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 7 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/linux-build.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
name: linux-build
name: Linux Build

on:
push:
workflow_dispatch:
workflow_call:

jobs:
linux-build:
Expand All @@ -18,7 +17,7 @@ jobs:
repository: novusengine/Engine

- name: Setup premake
uses: abel0b/setup-premake@v2
uses: abel0b/setup-premake@v2.3
with:
version: "5.0.0-beta1"

Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/on-label-linux-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: PR Linux Build

on:
workflow_dispatch:
pull_request:
types: [ labeled ]

jobs:
call-linux-build:
if: ${{ github.event.label.name == 'build-linux' }}
name: Linux Build
uses: ./.github/workflows/linux-build.yml
12 changes: 12 additions & 0 deletions .github/workflows/on-label-win-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: PR Windows Build

on:
workflow_dispatch:
pull_request:
types: [ labeled ]

jobs:
call-windows-build:
if: ${{ github.event.label.name == 'build-win' }}
name: Windows Build
uses: ./.github/workflows/win-build.yml
14 changes: 14 additions & 0 deletions .github/workflows/on-push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Build

on:
push:
workflow_dispatch:

jobs:
call-windows-build:
name: Windows Build
uses: ./.github/workflows/win-build.yml

call-linux-build:
name: Linux Build
uses: ./.github/workflows/linux-build.yml
7 changes: 4 additions & 3 deletions .github/workflows/win-build.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
name: win-build
name: Windows Build

on:
push:
workflow_dispatch:
workflow_call:

jobs:
win-build:
runs-on: self-hosted

strategy:
fail-fast: false

steps:
- uses: actions/checkout@v4
with:
Expand Down

0 comments on commit ec764da

Please sign in to comment.