Ansariel
cb43d15c23
Merge branch 'main' of https://github.com/secondlife/viewer
...
# Conflicts:
# README.md
2024-03-01 20:07:23 +01:00
Ansariel
e13ab75b9b
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-03-01 20:05:51 +01:00
Nat Goodspeed
1204468415
Merge DRTVWR-489 to main on promotion of Emoji viewer ( #673 ).
2024-03-01 10:23:56 -05:00
Brad Linden
0f2248ea12
Improving issue templates. ( #877 )
...
making ordering explicit, and disabling blank issue submission to force
triage label to be set.
2024-02-22 13:01:49 -08:00
Vir Linden
ffef19843b
Delete .github/ISSUE_TEMPLATE/issue_template.md
2024-02-22 11:28:44 -05:00
Vir Linden
b9ac5e8433
Update issue_template.md
2024-02-22 11:26:54 -05:00
Vir Linden
e452eeb816
Update issue_template.md
2024-02-22 11:24:55 -05:00
Vir Linden
4b24b0d933
Create issue_template.md
...
Issue template for the "blank issue" option
2024-02-22 10:28:10 -05:00
Beq
d5e1b538d7
Update imported actions to remove deprecated JS dependency
2024-02-15 20:03:42 +00:00
Brad Linden
255bb8504d
Update cla.yaml allowlist to clear spurious errors ( #804 )
2024-02-14 09:54:46 -08:00
Ansariel
dd3b29d82c
Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer
2024-02-14 18:05:08 +01:00
Brad Linden
bf2fb55fe7
Update cla.yaml allowlist to clear spurious errors
2024-02-14 17:17:58 +02:00
Beq
40a64ed70c
Make windows testbuilds expire properly
...
hint: don't use bash style variable setting in powershell
2024-02-12 22:26:45 +00:00
Signal Linden
9b51fee9bc
Rename config.yaml to config.yml
...
Issue template configuration is the only github configuration file I've found which does not support both `*.yaml` and `*.yml` extensions. Drat.
2024-02-07 13:24:35 -08:00
Signal Linden
95f213115b
Add link to feedback portal
...
Provide a link to feedback.secondlife.com from the issue creation page.
2024-02-05 16:09:54 -08:00
Bennett Goble
27e3fdc957
build.yaml: Build shared branches
...
We're currently building every single commit pushed to Github. This is
racking up $20k in build charges a month and is generally superfluous.
This changeset alters build triggers so that builds automatically run if
they are committed to a **shared branch**:
- `release/*` - A release stabilization branch
- `project/*` - A project viewer branch
- `main/*` - The default/stable branch
PR commits are also automatically built.
...need to build another commit? Developers can trigger one using a
manual workflow run.
2024-01-31 13:26:14 -08:00
Vir Linden
c0861e9366
Merge pull request #692 from secondlife/vir-linden-issue-templates-1
...
Update enhancement.md
2024-01-30 09:35:03 -05:00
Vir Linden
00962fd397
Update enhancement.md
2024-01-29 12:42:28 -05:00
Vir Linden
a9158943a8
Update bug.yaml
2024-01-29 12:38:11 -05:00
RunitaiLinden
cb14e9a074
Create enhancement.md
2024-01-24 12:32:10 -06:00
RunitaiLinden
bc4bf9e207
Create bug.yaml
2024-01-24 12:30:45 -06:00
Beq
99851ed459
disable viewer_version extraction rule for now
2023-12-29 14:41:12 +00:00
Beq
5aa47877a2
Export python binary in ENV to satisfy CMake
...
Use env var to force the python version
set python for Cmake and remove python cache
2023-12-29 02:35:34 +00:00
Beq
549e7ff3c1
ensure python & python3 have the same requirements set
2023-12-29 02:34:56 +00:00
Beq
5198af498a
switch windows python back to defaults
2023-12-29 02:34:35 +00:00
Beq
b6d55cc43b
quick patch - not a fix, these will not run
...
clean up variable declarations and prep for bugsplat sym upload
bash variables hate whitespace
2023-12-29 02:34:09 +00:00
Beq
7db1a5ce49
fail means fail
2023-12-27 19:12:38 +00:00
Ansariel
e3c2f12d53
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/newview/skins/default/xui/da/panel_main_inventory.xml
# indra/newview/skins/default/xui/pt/panel_main_inventory.xml
# indra/newview/skins/default/xui/tr/panel_main_inventory.xml
# indra/newview/skins/default/xui/zh/panel_main_inventory.xml
2023-12-15 18:25:32 +01:00
Andrey Lihatskiy
793bed7d06
Merge branch 'main' into DRTVWR-489
...
# Conflicts:
# indra/newview/fonts/DejaVu-license.txt
# indra/newview/fonts/DejaVuSans-Bold.ttf
# indra/newview/fonts/DejaVuSans-BoldOblique.ttf
# indra/newview/fonts/DejaVuSans-Oblique.ttf
# indra/newview/fonts/DejaVuSans.ttf
# indra/newview/fonts/DejaVuSansMono.ttf
2023-12-15 07:06:15 +02:00
Alexander Gavriliuk
c9cd5631e4
Merge branch 'main' into DRTVWR-489
2023-12-05 03:37:06 +01:00
Ansariel
2351a0eeb6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# .github/release.yaml
2023-12-02 19:11:18 +01:00
Beq
190b76aaf9
be gone release.yaml
2023-12-02 16:10:20 +00:00
Ansariel
50c7296d34
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llvoavatar.cpp
2023-12-01 11:27:42 +01:00
Ansariel
cfd9c49647
Merge branch 'DRTVWR-587-maint-V' of H:/ViewerDev/viewer-587
...
# Conflicts:
# .gitignore
2023-11-30 18:44:01 +01:00
Beq Janus
15530d71f3
alpha goes to test folder
2023-11-25 19:19:11 +00:00
Signal Linden
5416d94d07
Merge branch 'DRTVWR-587-maint-V' into signal/simple-release
2023-11-21 08:07:20 -08:00
Bennett Goble
c0ab8b8f0c
Switch to viewer-build-util@v1
...
Switch the build workflow from targeting the `main` branch of
viewer-build-util (which may receive breaking changes) to the stable
`v1` major version tag.
2023-11-20 16:23:05 -08:00
Bennett Goble
9b50c50bf2
Only download release artifacts for release
...
Only download and publish installers on public releases. This simplifies
the release process, as the flatten_files utility from
viewer-build-utils is not necessary this way. More importantly, it
doesn't clutter public releases with files that shouldn't be published
such as debug symbols.
2023-11-20 08:13:59 -08:00
Ansariel
be71515833
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-11-20 13:05:09 +01:00
Beq
1ba1e68e25
Attempt to work around Mac issue with missing package llsd
2023-11-17 01:00:00 +00:00
Beq
d889f9e57b
change deployment target
2023-11-11 23:47:33 +00:00
Beq
e3e7123f1f
Tweak builds to remove 32-bit and add a manual trigger
2023-11-07 20:34:24 +00:00
Ansariel
aa847c1bac
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-11-07 10:23:48 +01:00
Beq
e346b14b94
quick hack to remove 32 bit builds.
...
proper refactor of addrsize to follow.
2023-11-07 01:28:03 +00:00
Ansariel
70db255e02
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# .github/workflows/build.yaml
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llcommon/tests/workqueue_test.cpp
# indra/newview/VIEWER_VERSION.txt
2023-10-27 11:52:59 +02:00
Brad Linden
0fe058f9b8
Fix build.yaml line that got dropped in the merge.
2023-10-26 10:37:19 -07:00
Ansariel
39a6735fc9
Merge branch 'main' of https://github.com/secondlife/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/cmake/APR.cmake
# indra/newview/CMakeLists.txt
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/viewer_manifest.py
# indra/test/namedtempfile.h
2023-10-26 15:49:12 +02:00
Brad Linden
673b3309dd
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-10-25 16:12:13 -07:00
Nat Goodspeed
e4d6a08941
SL-18837: Build all branches on GitHub now.
2023-10-25 14:39:31 -04:00
Nat Goodspeed
2e8e96cfbc
PIE-1057: viewer-build-util's azure branch has been merged to main.
2023-10-18 17:44:07 -04:00