alex/vello
1
0
Fork 0
mirror of https://github.com/italicsjenga/vello.git synced 2025-01-24 02:16:32 +11:00
Code Issues Projects Releases Packages Wiki Activity

Cover all generated shader directories

Browse source 
Also remove 'shader/gen' gitignore line in main (it's present in dev).
This commit is contained in:
Raph Levien 2022-07-13 08:45:22 -07:00
parent 52f1ab228b
commit a2f9e106cc
3 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.github/actions/shader/action.yml vendored
View file

@ -16,7 +16,15 @@ runs:
- name: install DXC - name: install DXC
uses: napokue/setup-dxc@v1.0.0 uses: napokue/setup-dxc@v1.0.0
- name: run shader compilers - name: 'run shader compilers: piet-gpu'
run: ninja run: mkdir gen && ninja
shell: pwsh shell: pwsh
working-directory: piet-gpu/shader 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
View file

@ -18,20 +18,21 @@ jobs:
run: | run: |
git fetch origin main git fetch origin main
git switch 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" 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 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 - uses: ./.github/actions/shader
- name: commit - name: commit compiled shaders
id: commit
continue-on-error: true continue-on-error: true
run: | run: |
git add piet-gpu/shader/gen git add piet-gpu/shader/gen
git config user.name "Commit by GitHub Action" git add tests/shader/gen
git config user.email "nobody@example.com" git add piet-gpu-hal/examples/shader/gen
git commit -m "commit compiled shaders" git commit -m "commit compiled shaders"
- name: push - name: push
if: steps.commit.outcome == 'success' run: git push origin main
run: |
git show-ref
git push origin main

1
.github/workflows/shader.yml vendored
View file

@ -9,5 +9,4 @@ jobs:
name: compile shaders name: compile shaders
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- run: mkdir piet-gpu/shader/gen
- uses: ./.github/actions/shader - uses: ./.github/actions/shader