mirror of
https://github.com/italicsjenga/vello.git
synced 2025-01-23 18:06:34 +11:00
Cover all generated shader directories
Also remove 'shader/gen' gitignore line in main (it's present in dev).
This commit is contained in:
parent
52f1ab228b
commit
a2f9e106cc
3 changed files with 20 additions and 12 deletions
12
.github/actions/shader/action.yml
vendored
12
.github/actions/shader/action.yml
vendored
|
@ -16,7 +16,15 @@ runs:
|
|||
- name: install DXC
|
||||
uses: napokue/setup-dxc@v1.0.0
|
||||
|
||||
- name: run shader compilers
|
||||
run: ninja
|
||||
- name: 'run shader compilers: piet-gpu'
|
||||
run: mkdir gen && ninja
|
||||
shell: pwsh
|
||||
working-directory: piet-gpu/shader
|
||||
- name: 'run shader compilers: tests'
|
||||
run: mkdir gen && ninja
|
||||
shell: pwsh
|
||||
working-directory: tests/shader
|
||||
- name: 'run shader compilers: piet-gpu-hal/examples'
|
||||
run: mkdir gen && ninja
|
||||
shell: pwsh
|
||||
working-directory: piet-gpu-hal/examples/shader
|
||||
|
|
19
.github/workflows/push-shader.yml
vendored
19
.github/workflows/push-shader.yml
vendored
|
@ -18,20 +18,21 @@ jobs:
|
|||
run: |
|
||||
git fetch origin main
|
||||
git switch main
|
||||
git config user.name "Commit by GitHub Action"
|
||||
git config user.email "nobody@example.com"
|
||||
git merge dev -m "merge from dev branch"
|
||||
sed -i '' '/shader\/gen/d' .gitignore
|
||||
git add .gitignore
|
||||
git rm -r --ignore-unmatch piet-gpu/shader/gen
|
||||
mkdir piet-gpu/shader/gen
|
||||
git rm -r --ignore-unmatch tests/shader/gen
|
||||
git rm -r --ignore-unmatch piet-gpu-hal/examples/shader/gen
|
||||
- uses: ./.github/actions/shader
|
||||
- name: commit
|
||||
id: commit
|
||||
- name: commit compiled shaders
|
||||
continue-on-error: true
|
||||
run: |
|
||||
git add piet-gpu/shader/gen
|
||||
git config user.name "Commit by GitHub Action"
|
||||
git config user.email "nobody@example.com"
|
||||
git add tests/shader/gen
|
||||
git add piet-gpu-hal/examples/shader/gen
|
||||
git commit -m "commit compiled shaders"
|
||||
- name: push
|
||||
if: steps.commit.outcome == 'success'
|
||||
run: |
|
||||
git show-ref
|
||||
git push origin main
|
||||
run: git push origin main
|
||||
|
|
1
.github/workflows/shader.yml
vendored
1
.github/workflows/shader.yml
vendored
|
@ -9,5 +9,4 @@ jobs:
|
|||
name: compile shaders
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- run: mkdir piet-gpu/shader/gen
|
||||
- uses: ./.github/actions/shader
|
||||
|
|
Loading…
Add table
Reference in a new issue