AuroraMiddleware/SPIRV-Cross
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates for main branch rename.

Browse Source
This commit is contained in:
Hans-Kristian Arntzen 2023-01-12 17:52:15 +01:00
parent 88c6b49959
commit 49e4117c5f
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View File

@ -5,7 +5,7 @@ name: CI
on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
types: [ opened, synchronize, reopened ]

8
README.md
View File

@ -8,7 +8,7 @@
SPIRV-Cross is a tool designed for parsing and converting SPIR-V to other shader languages.
[![CI](https://github.com/KhronosGroup/SPIRV-Cross/actions/workflows/main.yml/badge.svg)](https://github.com/KhronosGroup/SPIRV-Cross/actions/workflows/main.yml)
[![Build Status](https://ci.appveyor.com/api/projects/status/github/KhronosGroup/SPIRV-Cross?svg=true&branch=master)](https://ci.appveyor.com/project/HansKristian-Work/SPIRV-Cross)
[![Build Status](https://ci.appveyor.com/api/projects/status/github/KhronosGroup/SPIRV-Cross?svg=true&branch=main)](https://ci.appveyor.com/project/HansKristian-Work/SPIRV-Cross)
## Features
@ -31,6 +31,10 @@ However, most missing features are expected to be "trivial" improvements at this
SPIRV-Cross has been tested on Linux, iOS/OSX, Windows and Android. CMake is the main build system.
### NOTE: main branch rename
On 2023-01-12, `master` was renamed to `main` as per Khronos policy.
### Linux and macOS
Building with CMake is recommended, as it is the only build system which is tested in continuous integration.
@ -499,7 +503,7 @@ to update the reference files and include these changes as part of the pull requ
Always make sure you are running the correct version of glslangValidator as well as SPIRV-Tools when updating reference files.
See `checkout_glslang_spirv_tools.sh` which revisions are currently expected. The revisions change regularly.
In short, the master branch should always be able to run `./test_shaders.py shaders` and friends without failure.
In short, the main branch should always be able to run `./test_shaders.py shaders` and friends without failure.
SPIRV-Cross uses Travis CI to test all pull requests, so it is not strictly needed to perform testing yourself if you have problems running it locally.
A pull request which does not pass testing on Travis will not be accepted however.

2
checkout_glslang_spirv_tools.sh
View File

@ -38,7 +38,7 @@ fi
if [ -d external/spirv-headers ]; then
cd external/spirv-headers
git pull origin master
git fetch origin
git checkout $SPIRV_HEADERS_REV
cd ../..
else