Skip to content

Commit 22cf0ea

Browse files
MrSidimssvenvh
authored andcommitted
[NFC] Preparations to rename the default branch
Signed-off-by: Dmitry Sidorov <[email protected]>
1 parent dbf3aee commit 22cf0ea

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,6 @@ it can be merged:
106106
[json grammar file]: https://github.com/KhronosGroup/SPIRV-Headers/blob/master/include/spirv/unified1/spirv.core.grammar.json
107107
[instructions]: https://github.com/KhronosGroup/SPIRV-Headers#generating-headers-from-the-json-grammar-for-the-spir-v-core-instruction-set
108108
[SPIR-V Headers repository]: https://github.com/KhronosGroup/SPIRV-Headers
109-
[internal SPIR-V header file]: https://github.com/KhronosGroup/SPIRV-LLVM-Translator/blob/master/lib/SPIRV/libSPIRV/spirv_internal.hpp
109+
[internal SPIR-V header file]: https://github.com/KhronosGroup/SPIRV-LLVM-Translator/blob/main/lib/SPIRV/libSPIRV/spirv_internal.hpp
110110
[Contributor License Agreement]: https://cla-assistant.io/KhronosGroup/SPIRV-LLVM-Translator
111111
[Travis CI testing]: https://travis-ci.org/KhronosGroup/SPIRV-LLVM-Translator

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# LLVM/SPIR-V Bi-Directional Translator
22

3-
[![Out-of-tree build & tests](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/workflows/Out-of-tree%20build%20&%20tests/badge.svg?branch=master&event=schedule)](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/actions?query=workflow%3A%22Out-of-tree+build+%26+tests%22+event%3Aschedule)
4-
[![In-tree build & tests](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/workflows/In-tree%20build%20&%20tests/badge.svg?branch=master&event=schedule)](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/actions?query=workflow%3A%22In-tree+build+%26+tests%22+event%3Aschedule)
3+
[![Out-of-tree build & tests](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/workflows/Out-of-tree%20build%20&%20tests/badge.svg?branch=main&event=schedule)](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/actions?query=workflow%3A%22Out-of-tree+build+%26+tests%22+event%3Aschedule)
4+
[![In-tree build & tests](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/workflows/In-tree%20build%20&%20tests/badge.svg?branch=main&event=schedule)](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/actions?query=workflow%3A%22In-tree+build+%26+tests%22+event%3Aschedule)
55

66
This repository contains source code for the LLVM/SPIR-V Bi-Directional Translator, a library and tool for translation between LLVM IR and [SPIR-V](https://www.khronos.org/registry/spir-v/).
77

@@ -19,7 +19,7 @@ The files/directories related to the translator:
1919

2020
## Build Instructions
2121

22-
The `master` branch of this repo is aimed to be buildable with the latest
22+
The `main` branch of this repo is aimed to be buildable with the latest
2323
LLVM `main` revision.
2424

2525
### Build with pre-installed LLVM
@@ -233,13 +233,13 @@ More information can be found in
233233
234234
## Branching strategy
235235
236-
Code on the master branch in this repository is intended to be compatible with
236+
Code on the main branch in this repository is intended to be compatible with
237237
the main branch of the [llvm](https://github.com/llvm/llvm-project)
238238
project. That is, for an OpenCL kernel compiled to llvm bitcode by the latest
239239
git revision of Clang it should be possible to translate it to SPIR-V with the
240240
llvm-spirv tool.
241241
242-
All new development should be done on the master branch.
242+
All new development should be done on the main branch.
243243
244244
To have versions compatible with released versions of LLVM and Clang,
245245
corresponding tags are available in this repository. For example, to build
@@ -249,9 +249,9 @@ one should use the
249249
[v7.0.0-1](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/tree/v7.0.0-1)
250250
tag. The 7.x releases are maintained on the
251251
[llvm_release_70](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/tree/llvm_release_70)
252-
branch. As a general rule, commits from the master branch may be backported to
252+
branch. As a general rule, commits from the main branch may be backported to
253253
the release branches as long as they do not depend on features from a later
254254
LLVM/Clang release and there are no objections from the maintainer(s). There
255255
is no guarantee that older release branches are proactively kept up to date
256-
with master, but you can request specific commits on older release branches by
256+
with main, but you can request specific commits on older release branches by
257257
creating a pull request or raising an issue on GitHub.

0 commit comments

Comments
 (0)