summaryrefslogtreecommitdiff
path: root/.github/workflows
diff options
context:
space:
mode:
authorJonathan "Geenz" Goodman <geenz@lindenlab.com>2025-05-31 09:33:42 -0400
committerGitHub <noreply@github.com>2025-05-31 09:33:42 -0400
commitc88f5d26dc894f8d82b948c387a9a3b70862731b (patch)
treefd96237f2a595396cd4a2861f976483ea8ef1544 /.github/workflows
parentaeefc73129978f6f2c1ba8caaff2750eff2cfbb3 (diff)
parent39625d10b8a50ed4ca91d618d6ad638b99087e35 (diff)
Merge pull request #4176 from secondlife/geenz/2025.04-to-develop
Merge 2025.04 into develop
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/.gitattributes1
-rw-r--r--.github/workflows/qatest.yaml2
2 files changed, 2 insertions, 1 deletions
diff --git a/.github/workflows/.gitattributes b/.github/workflows/.gitattributes
new file mode 100644
index 0000000000..6dc1cca42a
--- /dev/null
+++ b/.github/workflows/.gitattributes
@@ -0,0 +1 @@
+qatest.yaml -text eol=crlf
diff --git a/.github/workflows/qatest.yaml b/.github/workflows/qatest.yaml
index 14530ec824..b8047d2251 100644
--- a/.github/workflows/qatest.yaml
+++ b/.github/workflows/qatest.yaml
@@ -572,4 +572,4 @@ jobs:
# uses: actions/upload-artifact@v4
# with:
# name: test-results-${{ matrix.runner }}
- # path: ${{ matrix.install-path }}/regressionTest/test_results.html
+ # path: ${{ matrix.install-path }}/regressionTest/test_results.html \ No newline at end of file