Skip to content

Commit da25a77

Browse files
authored
Merge branch 'main' into rs_allocate_closure
2 parents ae990c3 + 05deead commit da25a77

129 files changed

Lines changed: 10347 additions & 7936 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 40 deletions
This file was deleted.
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
---
2+
name: Bug report
3+
about: I think I have identified a legit bug and can describe it.
4+
title: "[BUG]"
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
Note: The prompts below are just to help you formulate a good and actionable
11+
request. Feel free to deviate from this format or to delete this text and
12+
write free-form if you prefer.
13+
14+
**Describe the bug**
15+
16+
A clear and concise description of what the bug is. What happened, and
17+
what did you expect to happen instead.
18+
19+
20+
**OSL version and dependencies**
21+
22+
* OSL branch/version:
23+
* OS:
24+
* C++ compiler:
25+
* LLVM version:
26+
* OIIO version:
27+
28+
29+
**To Reproduce**
30+
31+
Steps to reproduce the behavior:
32+
1. Do this...
33+
2. Then this...
34+
3. Then THIS happens (reproduce the exact error message if you can)
35+
4. Whereas I expected this other specific thing to happen instead.
36+
37+
38+
**Evidence**
39+
40+
- Error messages (paste them here exactly)
41+
- Example shader code (if applicable)
42+
43+
44+
**IF YOU ALREADY HAVE A CODE FIX:** There is no need to file a separate issue,
45+
please just go straight to making a [pull request](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pulls).
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
name: Build problems
3+
about: I'm having trouble building OSL. Help!
4+
title: "[BUILD]"
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**PLEASE DO NOT REPORT BUILD TROUBLES AS GITHUB "ISSUES" UNLESS YOU ARE RALLY SURE IT'S A BUG**
11+
12+
The best way to get help with your build problems is to ask a question on the
13+
[osl-dev developer mail list](https://lists.aswf.io/g/osl-dev). For quick
14+
questions, you could also try the [ASWF Slack](https://slack.aswf.io)
15+
`#openshadinglanguage` channel.
16+
17+
When you email about this, please attach one or both of the following:
18+
1. The full verbose build log, which you can create like this:
19+
```make clean ; make VERBOSE=1 > build.log```
20+
2. The `CMakeCache.txt` file from your build directory.
21+
22+
If you are pretty sure that you have identified a **BUG** or other actual
23+
problem with the OSL build scripts and you can describe how to reproduce it,
24+
please file a [bug report issue](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/new?template=bug_report.md).
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
name: Feature request
3+
about: I have a concrete idea about how to improve OSL.
4+
title: "[FEATURE REQUEST]"
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
Note: The prompts below are just to help you formulate a good and actionable
11+
request. Feel free to deviate from this format or to delete this text and
12+
write free-form if you prefer.
13+
14+
**Is your feature request related to a problem? Please describe.**
15+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
16+
17+
**Describe the solution you'd like**
18+
19+
A clear and concise description of what you want to happen.
20+
21+
**Describe alternatives you've considered**
22+
A clear and concise description of any alternative solutions or features you've considered.
23+
24+
**Additional context**
25+
Add any other context about the feature request here.

.github/ISSUE_TEMPLATE/question.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
name: Question
3+
about: How do I... I need help with...
4+
title: "[HELP]"
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**PLEASE DO NOT ASK USAGE QUESTIONS USING GITHUB "ISSUES"**
11+
12+
If you are pretty sure that you have identified a **BUG** in OSL, please file
13+
a [bug report issue](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/new?template=bug_report.md).
14+
15+
But if you are just asking a question:
16+
* How do I...?
17+
* I need help with...
18+
* Am I doing something wrong?
19+
* I can't build OSL
20+
21+
For anything of this nature, the best way to get help using OSL is to ask a
22+
question on the [osl-dev developer mail list](https://lists.aswf.io/g/osl-dev).
23+
For quick questions, you could also try the [ASWF Slack](https://slack.aswf.io) `#openshadinglanguage` channel.
24+
25+
Please check the [documentation](https://docs.openshadinglanguage.org) first;
26+
you may find the answer more quickly than you can get your question answered
27+
on the mail list.
28+

.github/workflows/build-steps.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ on:
4444
type: string
4545
python_ver:
4646
type: string
47+
llvm_action_ver:
48+
type: string
4749
setenvs:
4850
type: string
4951
simd:
@@ -56,6 +58,8 @@ on:
5658
type: string
5759
build_docs:
5860
type: string
61+
clang_format:
62+
type: string
5963
generator:
6064
type: string
6165
ctest_args:
@@ -125,6 +129,11 @@ jobs:
125129
run: |
126130
${{inputs.setenvs}}
127131
src/build-scripts/ci-startup.bash
132+
- name: Install LLVM and Clang
133+
if: inputs.llvm_action_ver != ''
134+
uses: KyleMayes/install-llvm-action@6ba6e2cd3813def9879be378609d87cb3ef3bac3 # v2.0.6
135+
with:
136+
version: ${{ inputs.llvm_action_ver }}
128137
- name: Dependencies
129138
shell: bash
130139
run: |
@@ -155,6 +164,10 @@ jobs:
155164
if: inputs.skip_tests != '1'
156165
shell: bash
157166
run: src/build-scripts/ci-test.bash
167+
- name: clang-format
168+
if: inputs.clang_format == '1'
169+
shell: bash
170+
run: src/build-scripts/run-clang-format.bash
158171
- name: Code coverage
159172
if: inputs.coverage == '1'
160173
run: src/build-scripts/ci-coverage.bash

0 commit comments

Comments
 (0)