Skip to content

Commit

Permalink
Merge pull request #17 from TapzCrew/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
Arthapz authored Feb 20, 2024
2 parents 4a7b580 + 656a0a5 commit 5aa17c9
Show file tree
Hide file tree
Showing 173 changed files with 10,253 additions and 9,954 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/Android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
- '.github/workflows/iOS.yml'
- '.github/workflows/Ubuntu.yml'
- '.github/workflows/FreeBSD.yml'
- '.github/workflows/AutoMerger.yml'
- '.gitignore'
- 'LICENSE'
- 'README.md'
Expand All @@ -22,6 +23,7 @@ on:
- '.github/workflows/iOS.yml'
- '.github/workflows/Ubuntu.yml'
- '.github/workflows/FreeBSD.yml'
- '.github/workflows/AutoMerger.yml'
- '.gitignore'
- 'LICENSE'
- 'README.md'
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/AutoMerger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,23 @@ name: Automerge
on:
schedule:
- cron: '0 0 * * 0'
workflow_dispatch:
inputs:
logLevel:
description: 'Log level'
required: true
default: 'warning'
type: choice
options:
- info
- warning
- debug

env:
MY_REPO: https://Arthapz:${{secrets.GITHUB_TOKEN}}@github.com/TapzCrew/StormKit.git
MY_BRANCH: develop

MASTER_REPO: https://github.com/TapzCrew/StormKit.git
MASTER_REPO: https://Arthapz:${{secrets.GITHUB_TOKEN}}@github.com/TapzCrew/StormKit.git
MASTER_BRANCH: main

jobs:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/Linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
- '.github/workflows/macOS.yml'
- '.github/workflows/iOS.yml'
- '.github/workflows/Android.yml'
- '.github/workflows/AutoMerger.yml'
- '.gitignore'
- 'LICENSE'
- 'README.md'
Expand All @@ -21,6 +22,7 @@ on:
- '.github/workflows/macOS.yml'
- '.github/workflows/iOS.yml'
- '.github/workflows/Android.yml'
- '.github/workflows/AutoMerger.yml'
- '.gitignore'
- 'LICENSE'
- 'README.md'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/Windows-LLVM.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
- '.github/workflows/macOS.yml'
- '.github/workflows/iOS.yml'
- '.github/workflows/Android.yml'
- '.github/workflows/AutoMerger.yml'
- '.gitignore'
- 'LICENSE'
- 'README.md'
Expand All @@ -21,6 +22,7 @@ on:
- '.github/workflows/macOS.yml'
- '.github/workflows/iOS.yml'
- '.github/workflows/Android.yml'
- '.github/workflows/AutoMerger.yml'
- '.gitignore'
- 'LICENSE'
- 'README.md'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/Windows-MSVC.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
- '.github/workflows/macOS.yml'
- '.github/workflows/iOS.yml'
- '.github/workflows/Android.yml'
- '.github/workflows/AutoMerger.yml'
- '.gitignore'
- 'LICENSE'
- 'README.md'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/iOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
- '.github/workflows/macOS.yml'
- '.github/workflows/Ubuntu.yml'
- '.github/workflows/Android.yml'
- '.github/workflows/AutoMerger.yml'
- '.gitignore'
- 'LICENSE'
- 'README.md'
Expand All @@ -22,6 +23,7 @@ on:
- '.github/workflows/macOS.yml'
- '.github/workflows/Ubuntu.yml'
- '.github/workflows/Android.yml'
- '.github/workflows/AutoMerger.yml'
- '.gitignore'
- 'LICENSE'
- 'README.md'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
id: cache_llvm
uses: actions/cache@v4
with:
path: ${{ runner.workspace }}/StormKit/llvm-minified
path: ${{ runner.workspace }}/StormKit/llvm
key: ${{ matrix.os }}-llvm
save-always: true
restore-keys: |
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
- name: Configure & Build
id: build
run: |
xmake f -v --yes -m ${{ (matrix.mode == 'release' || matrix.mode == 'debug') && matrix.mode || 'releasedbg' }} -k ${{ matrix.kind }} --sanitizers=${{ matrix.mode == 'asan' && 'y' || 'n' }} --examples=y --tests=y --toolchain=llvm --sdk="${{ runner.workspace }}/StormKit/llvm-minified/" --runtimes="c++_shared"
xmake f -v --yes -m ${{ (matrix.mode == 'release' || matrix.mode == 'debug') && matrix.mode || 'releasedbg' }} -k ${{ matrix.kind }} --sanitizers=${{ matrix.mode == 'asan' && 'y' || 'n' }} --examples=y --tests=y --toolchain=llvm --sdk="${{ runner.workspace }}/StormKit/llvm/" --runtimes="c++_shared"
xmake b -v
- name: Tests
Expand Down
223 changes: 0 additions & 223 deletions examples/engine/triangle/src/App.cpp

This file was deleted.

Loading

0 comments on commit 5aa17c9

Please sign in to comment.