From b0c951ffe348f478f27a85720cc7aeffea32fe73 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Geenz\" Goodman" Date: Fri, 27 Jun 2025 21:28:58 -0400 Subject: Revert "Merge develop into glTF mesh import" --- .github/workflows/build.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to '.github') diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4bf2af644a..198785d39b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -218,10 +218,8 @@ jobs: prefix=${ba[0]} if [ "$prefix" == "project" ]; then IFS='_' read -ra prj <<< "${ba[1]}" - prj_str="${prj[*]}" # uppercase first letter of each word - capitalized=$(echo "$prj_str" | awk '{for (i=1; i<=NF; i++) $i = toupper(substr($i,1,1)) substr($i,2); print}') - export viewer_channel="Second Life Project $capitalized" + export viewer_channel="Second Life Project ${prj[*]^}" elif [[ "$prefix" == "release" || "$prefix" == "main" ]]; then export viewer_channel="Second Life Release" @@ -457,6 +455,7 @@ jobs: prerelease: true generate_release_notes: true target_commitish: ${{ github.sha }} + previous_tag: release append_body: true fail_on_unmatched_files: true files: | -- cgit v1.2.3 From c58caf6b42f1efbab95e4acdaa8adf9c3d53c930 Mon Sep 17 00:00:00 2001 From: Signal Linden Date: Wed, 2 Jul 2025 09:20:59 -0700 Subject: Create pull_request_template.md Provide a PR template to expedite both internal and external contributions. --- .github/pull_request_template.md | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/pull_request_template.md (limited to '.github') diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000000..9130b90218 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,36 @@ +## Description + + + +## Related Issues + +- [ ] **Please link to a relevant GitHub issue for additional context.** + - **Bug Fix:** Link to an issue that includes reproduction steps and testing guidance. + - **Feature/Enhancement:** Link to an issue with a write-up, rationale, and requirements. + +Issue Link: + +--- + +## Checklist + +Please ensure the following before requesting review: + +- [ ] I have provided a clear title and detailed description for this pull request. +- [ ] The PR is linked to a relevant issue with sufficient context (see above). +- [ ] I have tested the changes locally and verified they work as intended. +- [ ] All new and existing tests pass (if applicable). +- [ ] Code follows the project's style guidelines. +- [ ] Documentation (if needed) has been updated. +- [ ] Any dependent changes have been merged and published in downstream modules +- [ ] I have reviewed the [contributing guidelines](../CONTRIBUTING.md). + +--- + +## Additional Notes + + -- cgit v1.2.3 From 2e1d8c3063a7420433ac432b5f1f7f436f9294d1 Mon Sep 17 00:00:00 2001 From: Signal Linden Date: Wed, 2 Jul 2025 09:50:23 -0700 Subject: Fix link in pull_request_template.md (#4329) Fix the link to CONTRIBUTING.md in the pull request template and simplify some of the checklist item language. --- .github/pull_request_template.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to '.github') diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 9130b90218..473498833e 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -19,13 +19,13 @@ Issue Link: Please ensure the following before requesting review: - [ ] I have provided a clear title and detailed description for this pull request. -- [ ] The PR is linked to a relevant issue with sufficient context (see above). +- [ ] The PR is linked to a relevant issue with sufficient context. - [ ] I have tested the changes locally and verified they work as intended. -- [ ] All new and existing tests pass (if applicable). +- [ ] All new and existing tests pass. - [ ] Code follows the project's style guidelines. -- [ ] Documentation (if needed) has been updated. +- [ ] Documentation has been updated if needed. - [ ] Any dependent changes have been merged and published in downstream modules -- [ ] I have reviewed the [contributing guidelines](../CONTRIBUTING.md). +- [ ] I have reviewed the [contributing guidelines](https://github.com/secondlife/viewer/blob/develop/CONTRIBUTING.md). --- -- cgit v1.2.3 From 6e186befad1eafd091a38c9e4d6b58cc09926e57 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 17 Jul 2025 11:23:10 +0300 Subject: Reapply "Merge develop into glTF mesh import" To simplify merging into mesh import branch This reverts commit b0c951ffe348f478f27a85720cc7aeffea32fe73. --- .github/workflows/build.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 198785d39b..4bf2af644a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -218,8 +218,10 @@ jobs: prefix=${ba[0]} if [ "$prefix" == "project" ]; then IFS='_' read -ra prj <<< "${ba[1]}" + prj_str="${prj[*]}" # uppercase first letter of each word - export viewer_channel="Second Life Project ${prj[*]^}" + capitalized=$(echo "$prj_str" | awk '{for (i=1; i<=NF; i++) $i = toupper(substr($i,1,1)) substr($i,2); print}') + export viewer_channel="Second Life Project $capitalized" elif [[ "$prefix" == "release" || "$prefix" == "main" ]]; then export viewer_channel="Second Life Release" @@ -455,7 +457,6 @@ jobs: prerelease: true generate_release_notes: true target_commitish: ${{ github.sha }} - previous_tag: release append_body: true fail_on_unmatched_files: true files: | -- cgit v1.2.3