aea351aee1
Trigger preview build from branch name
2023-09-05 13:24:21 +01:00
e7246ea176
Make the workaround Windows specific to stop upsetting Mac
2023-08-31 10:36:32 +01:00
458476b148
Allow nightly trigger and fix up Windows python anomalies
...
Allow nightly to be triggered by push to a branch called *nightly*
Windows has to expressly insert itself in the path to pickup the right version.
2023-08-30 23:06:54 +01:00
b7b87c7aaa
GHA updates to align with PBR.
...
fixes expiries and allows nightly testing via branch trigger
2023-08-30 09:51:42 +01:00
25d4d8fafd
windows needs requirements loaded & use specific version to allow cache
2023-08-29 20:59:43 +01:00
9c098fb132
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llmessage/llregionflags.h
# indra/newview/llfloaterregioninfo.cpp
2023-08-24 00:32:15 +02:00
b0217ec21a
bad indents kill yaml...
2023-08-06 20:08:43 +01:00
2e262de012
Allow "alpha" builds to have alternate 3p libs
...
Should fix nightlies.
2023-08-06 20:02:11 +01:00
b3bde7a446
improved trigger on GHA
2023-08-01 16:09:05 +01:00
317d4f7b0e
Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/00-Common.cmake
# indra/newview/installers/windows/installer_template.nsi
2023-07-04 14:48:18 +02:00
4eec1de041
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-07-04 14:46:02 +02:00
783d59fcd5
Tweak to ensure best match is picked up.
2023-06-27 17:27:59 +01:00
9a43a8b069
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-06-27 11:42:26 +02:00
13daa0f5af
Tweak linux matching
2023-06-27 02:02:51 +01:00
fff08e04dd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-05-31 10:36:15 +02:00
692a86e7cf
make the package match more robust.
2023-05-29 12:38:29 +01:00
137f5d145e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/llagentlistener.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llcommanddispatcherlistener.cpp
# indra/newview/llfilepicker_mac.mm
# indra/newview/llworldmapview.cpp
2023-05-18 14:03:52 +02:00
38023d741e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-05-17 18:05:14 +02:00
3b7b1c89a8
Make Nightly builds expire after 14 days
2023-05-05 00:39:09 +01:00
8874367f92
Move to MacOs11 as GitHub have stopped all the builds on 10.15
2023-05-04 18:09:07 +01:00
1f3f7f58cc
Support separate webhooks by release type
2023-05-04 14:53:24 +01:00
6c2afeac8d
Use latest autobuild, faster xz comp/decomp + cleanup
...
Cleanup build output to bring it under 2000 char limit for discord webhooks.
improve discord response reporting
requirements.txt updated to pickup latest versions, minimum set ready for PBR
2023-05-03 22:18:02 +01:00
dd1940e9bc
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-05-03 10:05:23 +02:00
2a6c81f1d6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-05-02 17:52:00 +02:00
3a79977bcf
Rework deployment script to unpack and support discord webhook
...
need to fetch the script
Make script more tolerant of errors.
Fix extraction of build_type for GitHub layout
Need to ignore pre-existing folders
We have multiple artifacts that we are merging into a common tree.
despite the clash of folders the files are not going to clash.
revert the artifact collection to per platform.
Simplify 64/32 test to remove ReleaseType dependency
2023-04-30 11:11:22 +01:00
650404903d
Build and Deploy
...
build and collect the artifacts then deploy once all builds complete
Add rclone setup
2023-04-28 09:56:56 +01:00
5aeae33677
Step one to enable nightlies
2023-04-26 01:15:25 +01:00
9b93864eb9
Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/tests/llleap_test.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfilepicker_mac.mm
# indra/newview/llinventorymodel.cpp
# indra/newview/llstartup.cpp
# indra/newview/llurldispatcher.cpp
# indra/newview/llvieweraudio.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/strings.xml
2023-04-21 14:22:42 +02:00
da32456165
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-contribute
...
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/llcommon/tests/llleap_test.cpp
# indra/newview/skins/default/xui/en/strings.xml
2023-04-21 12:38:19 +02:00
a0cdaa75a9
SL-18839: Add basic Github build
2023-04-10 16:17:51 -07:00
4619805d21
SL-19541: Add basic coding standards check
...
Run Linden coding standard git-hooks in a basic Github actions workflow.
2023-04-04 12:47:19 -07:00
62a57b441a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-03-28 18:02:32 +02:00
54c4f5ba0d
Clean up as we go to allow Linux bloat monster to build.
...
clean up ~25G wasted space on Linux build server
Linux only
Try gcc=10
Add swap space back
2023-03-07 22:17:58 +00:00
2c03c96b3e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-03-07 13:23:03 +01:00
f65cddf860
Merge branch 'contribute' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/lluuid.cpp
# indra/llcommon/lluuid.h
# indra/llprimitive/llmodel.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
# indra/newview/llinventorymodel.cpp
# indra/newview/llviewerwearable.h
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/da/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/de/floater_about.xml
# indra/newview/skins/default/xui/de/floater_perm_prefs.xml
# indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/en/floater_about.xml
# indra/newview/skins/default/xui/en/strings.xml
# indra/newview/skins/default/xui/es/floater_about.xml
# indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/fr/floater_about.xml
# indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
# indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/it/floater_about.xml
# indra/newview/skins/default/xui/it/floater_perm_prefs.xml
# indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/ja/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/pl/floater_about.xml
# indra/newview/skins/default/xui/pl/floater_about_land.xml
# indra/newview/skins/default/xui/pl/floater_animation_bvh_preview.xml
# indra/newview/skins/default/xui/pl/floater_associate_listing.xml
# indra/newview/skins/default/xui/pl/notifications.xml
# indra/newview/skins/default/xui/pl/panel_group_creation_sidetray.xml
# indra/newview/skins/default/xui/pl/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/pl/panel_outfit_snapshot_inventory.xml
# indra/newview/skins/default/xui/pl/panel_profile_firstlife.xml
# indra/newview/skins/default/xui/pl/panel_profile_pick.xml
# indra/newview/skins/default/xui/pl/panel_profile_picks.xml
# indra/newview/skins/default/xui/pl/panel_profile_secondlife.xml
# indra/newview/skins/default/xui/pl/panel_region_access.xml
# indra/newview/skins/default/xui/pl/panel_script_experience.xml
# indra/newview/skins/default/xui/pl/strings.xml
# indra/newview/skins/default/xui/pt/floater_about.xml
# indra/newview/skins/default/xui/pt/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/ru/floater_about.xml
# indra/newview/skins/default/xui/ru/floater_perm_prefs.xml
# indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/tr/floater_about.xml
# indra/newview/skins/default/xui/tr/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/zh/floater_about.xml
# indra/newview/skins/default/xui/zh/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
2023-03-01 12:54:24 +01:00
7731ee8d50
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llmeshrepository.cpp
2023-02-28 12:44:49 +01:00
7d5c93ce8b
Update GHA to improve handling of new 3p bundles.
...
also Update ubuntu to 20.04
deal with macOS being out of date (not to mention BSD)
handle case where some 3ps are generic (32/64)
2023-02-18 14:37:24 +00:00
3e96187edf
Improve GHA builds
...
- make sure we use the latest bundles provided
- rearrange things a little.
- make some initial steps towards trying to make things fail when config/build fails.
Improve OS/SL config switch
always use latest package version (by timestamp)
try another method that deals with not found (looking at you linux havok)
oops
I hate shell bl@*&y scripts
fix pattern
revert the autobuild version
wth
this makes no sense
fs-variables must be imported after the code
2023-02-18 14:37:24 +00:00
c833f711d5
Reduce stale time for PRs
...
Let's reduce the stale time from 60 days to 30. We already have at least two multi-month PRs.
2023-02-13 09:10:29 -08:00
e2eda8c2bd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-01-25 14:41:15 +01:00
3076d01fb4
update to control build channel from branch
...
oops
2023-01-20 18:47:10 +00:00
8d154eaa8c
Merge branch 'contribute' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llappearance/llavatarappearance.cpp
# indra/llappearance/lldriverparam.cpp
# indra/llappearance/llwearable.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/llthreadsafequeue.h
# indra/newview/app_settings/settings.xml
# indra/newview/llpathfindingnavmesh.cpp
# indra/newview/llviewerassetstorage.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/skins/default/xui/de/floater_flickr.xml
# indra/newview/skins/default/xui/de/panel_flickr_photo.xml
# indra/newview/skins/default/xui/en/floater_about_land.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
# indra/newview/skins/default/xui/fr/floater_flickr.xml
# indra/newview/skins/default/xui/fr/panel_flickr_account.xml
# indra/newview/skins/default/xui/fr/panel_flickr_photo.xml
# indra/newview/skins/default/xui/it/floater_flickr.xml
# indra/newview/skins/default/xui/it/panel_flickr_photo.xml
# indra/newview/skins/default/xui/ja/floater_flickr.xml
# indra/newview/skins/default/xui/ja/panel_flickr_photo.xml
# indra/newview/skins/default/xui/pl/floater_avatar_render_settings.xml
# indra/newview/skins/default/xui/pl/floater_ban_duration.xml
# indra/newview/skins/default/xui/pl/floater_camera_presets.xml
# indra/newview/skins/default/xui/pl/floater_classified.xml
# indra/newview/skins/default/xui/pl/floater_create_landmark.xml
# indra/newview/skins/default/xui/pl/floater_delete_pref_preset.xml
# indra/newview/skins/default/xui/pl/floater_fixedenvironment.xml
# indra/newview/skins/default/xui/pl/floater_flickr.xml
# indra/newview/skins/default/xui/pl/floater_linkreplace.xml
# indra/newview/skins/default/xui/pl/floater_load_pref_preset.xml
# indra/newview/skins/default/xui/pl/floater_my_environments.xml
# indra/newview/skins/default/xui/pl/floater_my_scripts.xml
# indra/newview/skins/default/xui/pl/floater_notifications_tabbed.xml
# indra/newview/skins/default/xui/pl/floater_pick_track.xml
# indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/pl/floater_preferences_view_advanced.xml
# indra/newview/skins/default/xui/pl/floater_preview_trash.xml
# indra/newview/skins/default/xui/pl/floater_profile.xml
# indra/newview/skins/default/xui/pl/floater_settings_picker.xml
# indra/newview/skins/default/xui/pl/floater_simple_outfit_snapshot.xml
# indra/newview/skins/default/xui/pl/menu_avatar_rendering_settings.xml
# indra/newview/skins/default/xui/pl/menu_avatar_rendering_settings_add.xml
# indra/newview/skins/default/xui/pl/panel_flickr_photo.xml
# indra/newview/skins/default/xui/pl/panel_progress.xml
# indra/newview/skins/default/xui/pl/panel_settings_sky_atmos.xml
# indra/newview/skins/default/xui/pl/panel_settings_sky_clouds.xml
# indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml
# indra/newview/skins/default/xui/ru/floater_flickr.xml
# indra/newview/skins/default/xui/ru/panel_flickr_account.xml
# indra/newview/skins/default/xui/ru/panel_flickr_photo.xml
2023-01-13 15:19:29 +01:00
fd1c0bc8bc
Extend GHA for Release builds (with Mac Codesigning)
...
add KDU from private repo
kdu is arch agnostic
modify for rclone
Add the fmodstudio
Switch to requirements.txt for python deps
workaround bad python in windows runner images.
Need to fetch full depth or we do not get our computed revision num
Try up to 10 times to detach HDI on Mac cos 5 was not always enough!
Fix bug on windows as side-effect of Mac cleanup doh
2022-12-17 16:00:04 +00:00
59b826e66e
Merge pull request #4 from secondlife/signal/stale
...
Close stale PRs
2022-11-21 16:02:02 -08:00
dbc70be7c4
Merge branch 'master' of https://github.com/secondlife/viewer
...
# Conflicts:
# README.md
# autobuild.xml
2022-11-21 20:37:32 +01:00
f7f163f010
Merge pull request #3 from secondlife/signal/label
...
Add automatic PR labels
2022-11-18 08:42:14 -08:00
d14c67509b
Mark PRs as stale after 60 days, close them automatically if no response
...
after 7 days.
2022-11-18 07:46:25 -08:00
e75104b066
Add automatic PR labels
2022-11-18 07:39:54 -08:00
eaf55065e2
Add CLA bot
2022-11-18 07:30:38 -08:00
9e19e6712b
updates for GHA to get windows to work.
...
also requires python hackery pushed as separate commit pending a better solution.
2022-09-17 22:26:27 +01:00
Beq