diff options
| author | Hans-Kristian Arntzen <post@arntzen-software.no> | 2023-01-12 17:52:15 +0100 |
|---|---|---|
| committer | Hans-Kristian Arntzen <post@arntzen-software.no> | 2023-01-12 17:52:15 +0100 |
| commit | 49e4117c5f56bec716ed00bcbf36d3a2e8efd90e (patch) | |
| tree | 1c30fea7675dac594428ace697ebc56efc0c0034 | |
| parent | 88c6b49959b7aaaaf105d1a11c67c50ed3623232 (diff) | |
| download | SPIRV-Cross-49e4117c5f56bec716ed00bcbf36d3a2e8efd90e.tar.gz SPIRV-Cross-49e4117c5f56bec716ed00bcbf36d3a2e8efd90e.tar.bz2 SPIRV-Cross-49e4117c5f56bec716ed00bcbf36d3a2e8efd90e.zip | |
Updates for main branch rename.
| -rw-r--r-- | .github/workflows/main.yml | 2 | ||||
| -rw-r--r-- | README.md | 8 | ||||
| -rwxr-xr-x | checkout_glslang_spirv_tools.sh | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ba7d8881..31fd1149 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,7 +5,7 @@ name: CI on: push: - branches: [ master ] + branches: [ main ] pull_request: types: [ opened, synchronize, reopened ] @@ -8,7 +8,7 @@ SPIRV-Cross is a tool designed for parsing and converting SPIR-V to other shader languages. [](https://github.com/KhronosGroup/SPIRV-Cross/actions/workflows/main.yml) -[](https://ci.appveyor.com/project/HansKristian-Work/SPIRV-Cross) +[](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. diff --git a/checkout_glslang_spirv_tools.sh b/checkout_glslang_spirv_tools.sh index 08bd71d0..88429395 100755 --- a/checkout_glslang_spirv_tools.sh +++ b/checkout_glslang_spirv_tools.sh @@ -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 |