Commit Graph

379 Commits (d4e9604700a1dbae3dbce58a3be0fda1465fd39c)

Author SHA1 Message Date
Nat Goodspeed 2c5066f1fc DRTVWR-601: Use viewer-build-util/which-branch to determine branch. 2023-12-18 17:35:23 -05:00
Nat Goodspeed b782ab73e6 DRTVWR-601: Make autobuild set vcs_url, vcs_branch, vcs_revision
in viewer's autobuild-package.xml.

Ensure that AUTOBUILD_VCS_BRANCH is set before the build.
2023-12-18 10:59:03 -05:00
Ansariel 783e488a63 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
# Conflicts:
#	indra/newview/llfloaterimcontainer.cpp
#	indra/newview/llspatialpartition.cpp
2023-12-15 22:48:56 +01: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 4b98ae6e8a Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-W
# Conflicts:
#	indra/newview/llspatialpartition.cpp
2023-12-14 02:47:44 +02:00
Ansariel 6be5fc07a0 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2023-12-12 12:21:31 +01:00
Ansariel 508eb80872 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-11-30 18:45:03 +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
Beq 1ba1e68e25 Attempt to work around Mac issue with missing package llsd 2023-11-17 01:00:00 +00:00
Nat Goodspeed 96deda3f63 SL-20546: build-variables viewer branch no longer exists. 2023-11-15 09:52:06 -05:00
Nat Goodspeed 819604d2ce SL-20546: Make dependency on build job explicit, not indirect.
The release job has been dependent on sign-and-package-windows and
sign-and-package-mac, each of which depends on build. But that indirect
dependency doesn't convey access to ${{ needs.build.outputs.xxx }}. Add the
build job to direct dependencies so release can access its outputs.
2023-11-15 09:44:38 -05:00
Ansariel c5240ea1d7 Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer 2023-11-15 11:56:19 +01:00
Nat Goodspeed 6654ad14ee SL-20546: Add PyGithub to installed Python packages. 2023-11-14 14:30:44 -05:00
Nat Goodspeed 59eeaed118 SL-20546: Try harder to infer the branch corresponding to build tag. 2023-11-14 14:20:51 -05:00
Nat Goodspeed 9e99bb04a3 SL-20546: Append generated release notes body to our explicit body.
For a tag build that generates a release page, try to deduce the git branch to
which the tag we're building corresponds and add that to release notes.
2023-11-14 04:09:56 -05: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
Beq e346b14b94 quick hack to remove 32 bit builds.
proper refactor of addrsize to follow.
2023-11-07 01:28:03 +00:00
Nat Goodspeed f71662225e SL-20546: Add viewer channel and full version to GitHub release page. 2023-10-31 10:50:39 -04: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
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
Nat Goodspeed f6d872a027 PIE-1057: Pass sign-pkg-windows@azure the Azure-related secrets. 2023-10-13 15:11:30 -04:00
Nat Goodspeed 549e56572b PIE-1057: Engage viewer-build-util azure branch. 2023-10-12 17:25:30 -04:00
Nat Goodspeed 7648978397 SL-18837: Name the release for the build number to readily find it. 2023-10-05 15:25:54 -04:00
Nat Goodspeed 1684d62499 SL-19242: Remove signing and packaging from viewer_manifest.py
for Mac and Windows. That's now done by subsequent jobs in the GitHub build.
Remove workflow step to upload installers before signing and packaging jobs.

Remove from viewer_manifest.py conditionals for 32-bit Windows or Mac.

Also bump to actions/checkout@v4, per dependabot.
2023-10-03 19:02:40 -04:00
Nat Goodspeed e2ea42cb6a SL-19242: Expect and pass Apple "Team ID" rather than "ASC Provider".
"ASC Provider" was a credential accepted by altool, but switching from altool
to notarytool requires a Team ID instead.

Expect to find TEAM_ID in our repository secret NOTARIZE_CREDS_MACOS. Extract
it and pass it to sign-pkg-mac.
2023-10-02 16:52:11 -04:00
Brad Linden d2d3599080 Attempt to fix SL-19242 notarize creds secrets loading 2023-09-25 14:02:26 -07:00
Nat Goodspeed 50e3d4020d SL-19242: Reference the actual stored GitHub repo secrets.
Add a Mac signing step to unpack the credentials bundled into
NOTARIZE_CREDS_MACOS so viewer-build-util/sign-pkg-mac need not know about
that peculiarity of our secrets formatting.
2023-09-25 11:19:38 -04:00
Nat Goodspeed e8dfbbaf88 SL-19242: Pass channel and imagename to sign-pkg-mac/action.yaml.
The viewer_manifest.py logic to determine the name of the viewer installer
.dmg is a little convoluted. Make it tell viewer-build-util/sign-pkg-mac that
name, rather than passing it all the relevant inputs and composing it
redundantly.

sign-pkg-mac also wants the viewer channel to determine the application name.
2023-09-20 11:34:56 -04:00
Nat Goodspeed 763fcb02b8 SL-19242: Move comments out of YAML parameter text. 2023-09-19 09:15:30 -04:00
Nat Goodspeed bd8ecbb389 SL-19242: Typo in changing from inline to reusable action. 2023-09-18 22:43:16 -04:00
Nat Goodspeed 1184c383e2 SL-19242: release job now depends on package jobs
and uses new viewer-build-util/release-artifacts action.
2023-09-18 22:39:43 -04:00
Nat Goodspeed 7c351379fc SL-19242: Retrieve and decode Windows signing cert, pass to action. 2023-09-15 15:17:40 -04:00
Nat Goodspeed b02249546e SL-19243: Directly reference action subdirs in viewer-build-util
instead of trying to checkout viewer-build-util (which doesn't work) and then
reference action subdirs from the filesystem.

Also engage (initial placeholder) actions to sign and package the
platform-specific application artifacts.
2023-09-12 16:28:09 -04:00
Nat Goodspeed 3e86f26b40 SL-19243: Try to convince GitHub that ./.util is really a path. 2023-09-12 13:55:08 -04:00
Nat Goodspeed d795b49f16 SL-19243: Job step 'uses' must specify action.yaml file
instead of having it implied by specifying the containing directory.
2023-09-12 12:50:13 -04:00
Nat Goodspeed 0992a0af3b SL-19243: Use consolidated viewer-build-util
instead of distinct viewer-post-bugsplat-{windows,mac} repos.
2023-09-12 12:46:28 -04:00
Nat Goodspeed 29300a1fd3 SL-19242: Try harder to post artifacts containing exactly app image.
In a Windows build tree, we don't actually have an app-named top directory, so
don't package its containing directory -- just the app dir itself, e.g.
"newview/Release".

In a Mac build tree, though we do have "Second Life Mumble.app", its parent
directory also contains other large stuff. Try posting a temp directory
containing a symlink to the .app.

Ditch the "!*.bat" exclusion: the presence of a second path (even an
exclusion) changes how upload-artifact nests its contents.
2023-09-11 10:07:51 -04:00
Nat Goodspeed 63d5d38e36 SL-18837: Stop failing build.sh if there's no installer.
This unblocks ReleaseOS builds, and also preps for SL-19242.

Streamline build.sh's Uploads section.
2023-09-08 17:24:04 -04:00
Nat Goodspeed 2d04cc14d3 SL-19242: Post -app artifact, not -exe, with entire install image.
Previously we posted Windows-exe, macOS-exe artifacts that were a little
inconsistent: Windows-exe contained just the Windows executable, whereas
macOS-exe contained the whole .app tree (but without the .app directory).

Change to post Windows-app, macOS-app artifacts that each contain the whole
viewer install image, including the top-level application name directory. This
is what we'll need to codesign and notarize.
2023-09-08 17:01:46 -04:00
Nat Goodspeed c87d9c635b SL-18837: Suppress ReleaseOS for now. 2023-09-08 14:30:05 -04:00
Nat Goodspeed 77227cf5c4 SL-18837: Suppress BUGSPLAT_DB for ReleaseOS builds. 2023-09-07 14:09:54 -04:00
Nat Goodspeed bac73831c0 SL-18837: String literals are single-quoted in GitHub expressions. 2023-09-07 11:48:15 -04:00
Nat Goodspeed 949909013e SL-18837: Segregate ReleaseOS artifacts; don't even upload.
Eliminate references to (no longer set) matrix.addrsize.
2023-09-07 11:38:00 -04:00
Nat Goodspeed b8e6777439 SL-18837: Merge branch 'main' into actions 2023-09-07 11:15:56 -04:00
Nat Goodspeed 755f9d9ac9 SL-19243: Specify macos-latest for post-mac-symbols.
We want to run on a GitHub-hosted runner rather than one of our own.
2023-09-06 17:03:22 -04:00
Beq aea351aee1 Trigger preview build from branch name 2023-09-05 13:24:21 +01:00
Nat Goodspeed 7cedb1eb20 SL-19243: Add post-mac-symbols job using viewer-post-bugsplat-mac.
The initial viewer-post-bugsplat-mac is just a placeholder so far, but we can
flesh it out while the viewer builds necessitated by this change are running,
and then we can iterate on viewer-post-bugsplat-mac without having to rebuild
the viewer.
2023-09-01 10:53:02 -04:00
Nat Goodspeed 2ee8cb0e16 SL-19243: Job to post windows symbols must run on Windows. 2023-09-01 07:46:32 -04:00
Nat Goodspeed 3147b55cec SL-19243: Fix wonky 'if:' in build.yaml 2023-08-31 17:28:25 -04:00
Nat Goodspeed 348d710707 SL-19243: Fix 'uses:' reference to viewer-post-bugsplat-windows 2023-08-31 16:09:12 -04:00
Nat Goodspeed 58e8c3567f SL-19243: Fix build.yaml syntax error. 2023-08-31 16:06:13 -04:00
Nat Goodspeed e8cd5205e8 SL-19243: Try to run Windows BugSplat uploads as a separate GH job.
Upload a new Windows-exe artifact containing just the executable (needed by
BugSplat) separately from the artifact containing the whole NSIS installer.
This requires a new viewer_exe step output set by viewer_manifest.py.

Define viewer_channel and viewer_version as build job outputs.

Set viewer_channel in build.yaml when tag is interpreted.

Set viewer_version in build.sh at the point when it would have posted
viewer_version.txt to codeticket.

Add a post-windows-symbols job dependent on the build job that engages
secondlife/viewer-post-bugsplat-windows, which in turn engages
secondlife/post-bugsplat-windows. We keep the actual upload code in a separate
repo in case we need to modify that code before rerunning to resolve upload
errors. If we kept the upload code in the viewer repo itself, rerunning the
upload with modifications would necessarily require rerunning the viewer
build, which would defeat the purpose of SL-19243.

Because of that new upload job in build.yaml, skip Windows symbol uploads
in build.sh.

Use a simple (platform name) artifact name for metadata because of
flatten_files.py's filename collision resolution.

Use hyphens, not spaces, in remaining artifact names: apparently
download-artifact doesn't much like artifacts with spaces in their names.

Only run the release job when in fact there's a tag. Without that, we get
errors. We need not create flatten_files.py's output directory beforehand
because it will do that implicitly.
2023-08-31 15:53:56 -04:00
Beq e7246ea176 Make the workaround Windows specific to stop upsetting Mac 2023-08-31 10:36:32 +01:00
Beq 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
Beq b7b87c7aaa GHA updates to align with PBR.
fixes expiries and allows nightly testing via branch trigger
2023-08-30 09:51:42 +01:00
Nat Goodspeed b06aa53f59 SL-18837: Only list the downloaded artifacts. 2023-08-29 20:03:21 -04:00
Nat Goodspeed 7779cebdcd SL-18837: Introduce flatten_files.py and use to post release assets 2023-08-29 17:55:53 -04:00
Beq 25d4d8fafd windows needs requirements loaded & use specific version to allow cache 2023-08-29 20:59:43 +01:00
Nat Goodspeed 929aa15c80 SL-18837: Experiment with download-artifact downloading all files. 2023-08-28 13:21:16 -04:00
Ansariel 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
Nat Goodspeed 70e4c73baa SL-18837: Engage initial GH viewer release script. 2023-08-18 11:28:15 -04:00
Beq b0217ec21a bad indents kill yaml... 2023-08-06 20:08:43 +01:00
Beq 2e262de012 Allow "alpha" builds to have alternate 3p libs
Should fix nightlies.
2023-08-06 20:02:11 +01:00
Beq b3bde7a446 improved trigger on GHA 2023-08-01 16:09:05 +01:00
Nat Goodspeed 73a857ba31 SL-18837: Use 'needs' context, not 'jobs' context
in release job to reference outputs from the build job.

Also mark the release as prerelease, and fail the release action if we still
can't find the files we're trying to post.
2023-07-22 08:32:21 -04:00
Nat Goodspeed f9a30e7ed1 SL-18837: Try posting build.yaml step outputs as job outputs. 2023-07-22 08:18:13 -04:00
Nat Goodspeed 6605403661 SL-18837: Tags can't have spaces or colons. Look for valid ones. 2023-07-21 15:24:11 -04:00
Nat Goodspeed 7cca3506b6 SL-18837: Try triggering GH release for tag like "Second Life "... 2023-07-21 14:02:00 -04:00
Nat Goodspeed 0d4228b55a SL-18837: Use secondlife -3p/action-gh-release
instead of the original softprops/action-gh-release repo, because organization
rules forbid directly using the softprops repo.
2023-07-18 15:38:44 -04:00
Nat Goodspeed 2b97587a14 SL-18837: Try to post installer and metadata for GH viewer release. 2023-07-18 15:25:09 -04:00
Nat Goodspeed dcb1403661 SL-18837: Re-delete redundant matrix.include python-version.
This clarifies that the matrix.include entry is intended to supplement an
existing runner configuration, rather than adding a new configuration for the
same runner.
2023-07-18 11:41:32 -04:00
Nat Goodspeed a4882870f8 SL-18837: Merge branch 'actions' into actions-build-sh 2023-07-18 11:37:55 -04:00
Nat Goodspeed 6fd46b85f5 SL-18837: Detect msys bash as well as cygwin for native_path et al. 2023-07-18 10:54:12 -04:00
Nat Goodspeed 479fa3e196 SL-18837: Conditionally upload llphysicsextensions-tpv package
but only when building viewer-private.

Also re-fix SL-19942 workaround by deleting AUTOBUILD_CONFIGURATION before
trying to build llphysicsextensions-tpv.
2023-07-18 09:56:11 -04:00
Nat Goodspeed 54f9ca5404 SL-18837: Merge branch 'actions' into actions-build-sh 2023-07-17 15:41:26 -04:00
Brad Linden 0998d46f47 Fix "intermittent" llrand unit test failure on windows on DRTVWR-578. we must return less than 1.0 when rand() returns RAND_MAX
also, disable 32 bit build now that we have deprecated it.
https://community.secondlife.com/blogs/entry/13464-end-of-support-for-second-life-32-bit-windows-viewer-and-updated-minimum-system-requirements-for-macos-to-1013/
2023-07-14 18:05:44 -07:00
Nat Goodspeed d8292a6291 SL-18837: Disable APR_LOG for now, but leave notes for the future. 2023-07-10 14:46:14 -04:00
Nat Goodspeed 7dc6211ad5 SL-18837: Force llprocess_test and llleap_test to use just 'python'.
On GitHub Windows runners, trying to make build.yaml set PYTHON=python in the
environment doesn't work: integration tests still fail with "Access is denied"
because they're still trying to execute the interpreter's full pathname.

Instead, make llprocess_test and llleap_test detect the case of GitHub Windows
and override the environment variable PYTHON with a baked-in string constant
"python".
2023-07-08 14:08:16 -04:00
Nat Goodspeed ca4288edaa SL-18837: Try running just 'python' for Windows integration tests. 2023-07-08 13:35:53 -04:00
Nat Goodspeed eff1c0b55c SL-18837: Set APR_LOG within build step, not at job level. 2023-07-08 13:15:01 -04:00
Nat Goodspeed 0d4e5b6bf8 SL-18837: Use runner.temp rather than $RUNNER_TEMP. 2023-07-08 13:12:25 -04:00
Nat Goodspeed 1ec6c74404 SL-18837: Set APR_LOG once for the whole job
instead of a new value for each LLProcess::create() invocation.

Since the internal apr_log() function only looks at APR_LOG once per process,
the first test (which succeeded, hence no log file dump) left the log file
open with that same original pathname. Resetting the APR_LOG environment
variable for subsequent runs only made the new code in llprocess_test look for
files that were never created.
2023-07-08 11:08:16 -04:00
Nat Goodspeed f54c121567 SL-18837: Try putting generated Python scripts in RUNNER_TEMP dir.
The claim is that the Windows Python interpreter is integrated somehow with
the OS such that a command line that tries to run Python with a script that
"looks suspicious" (i.e. in a system temp directory) fails with "Access
denied" without even loading the interpreter. At least that theory would
explain the "Access denied" errors we've been getting trying to run Python
scripts generated into the system temp directory by our integration tests.

Our hope is that generating such scripts into the GitHub RUNNER_TEMP directory
will work better.

As this test is specific to Windows, don't even bother running Mac builds.
2023-07-07 10:06:02 -04:00
Nat Goodspeed 2b1a3cf9cd SL-18837: Use multi-line GitHub outputs to upload artifacts.
Having observed installer upload failures, I discovered the warning in
actions/upload-artifact/README.md about multiple concurrent jobs trying to
post the same pathname to the same artifact name. Try to disambiguate
artifacts not only for different platforms, but for different jobs running on
the same platform.

This change also reflects my understanding that an artifact is (effectively) a
distinct zip file that can contain multiple uploaded files. Because we'll want
to download metadata without having to download enormous installers, create a
separate metadata artifact per platform. Similarly, symbol files can get large:
use a third distinct artifact for symbol files.

But with those artifacts defined, leverage actions/upload-artifact's ability
to upload multiple paths to the same artifact. In build.sh, define bash arrays
installer, metadata, symbolfile and set up so that, on exit, each is written
to a GITHUB_OUTPUT variable with the corresponding name. This involves a
little magic to get macOS bash 3 to indirectly access an array.

These multi-line output variables are then used to drive the upload-artifact
step for each of the defined artifacts.
2023-07-07 06:38:03 -04:00
Nat Goodspeed 07b47160f1 SL-18837: Ding Dong, 32-bit is dead! 2023-07-06 17:38:58 -04:00
Nat Goodspeed ca5f3e3b35 SL-18837: Add addoutput, addarrayoutput functions to build.sh
and use them instead of codeticket addoutput to pass GitHub xxx_name, xxx_path
outputs to build.yaml.

Add upload steps to build.yaml to try to upload build products identified in
build.sh.
2023-07-06 17:29:40 -04:00
Ansariel 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
Ansariel 4eec1de041 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-07-04 14:46:02 +02:00
Nat Goodspeed 5f1de35f39 SL-18837: Unset AUTOBUILD_CONFIGURATION.
We suspect that autobuild incorrectly prioritizes AUTOBUILD_CONFIGURATION over
its command-line -c switch. The autobuild command to build the TPV package for
llphysicsextensions specifies -c Tpv (the configuration in the specified
config file), but with AUTOBUILD_CONFIGURATION=Release set, autobuild fails:
"ERROR: no configuration for build configuration 'Release' found"
2023-06-30 10:51:03 -04:00
Nat Goodspeed 153f5cdb9f SL-18837: Revert "Install autobuild from source repo, not PyPI."
That doesn't seem to be the distinction between TC builds and GH builds.
Instead, we'll try unsetting AUTOBUILD_CONFIGURATION.

This reverts commit d62e7039da.
2023-06-30 10:44:17 -04:00
Nat Goodspeed d62e7039da SL-18837: Install autobuild from source repo, not PyPI.
Bug in autobuild 3.9.2? The TC viewer build can successfully build
llphysicsextensions/autobuild-tpv.xml, but the previous GH actions build
failed: "no configuration for Release found" despite -c Tpv. The difference
seems to be that we used 'pip3 install autobuild' from PyPI, whereas the TC
buildscripts setup clones secondlife/autobuild branch v3 and installs from
that repo.
2023-06-29 14:03:31 -04:00
Nat Goodspeed 2ab1431648 SL-18837: Temporarily suppress Windows builds; add finalize function
Also pretend novel arch value MINGW6 is really CYGWIN so we'll recognize it.
2023-06-29 09:08:41 -04:00
Nat Goodspeed 41d937d2c0 SL-18837: Don't try to engage git-hooks explicitly at all. 2023-06-28 17:15:06 -04:00
Nat Goodspeed d2294841b2 SL-18837: Get buildscripts_support_functions from sling-buildscripts
and use these variants for GitHub builds.
2023-06-28 16:58:32 -04:00
Nat Goodspeed 853cf3928c SL-18837: Don't fetch (unmigrated) build-secrets, use GH secrets. 2023-06-28 16:44:03 -04:00
Nat Goodspeed ce3508613b SL-18837: Include actions-build-sh branch in build trigger pushes. 2023-06-28 09:36:25 -04:00
Nat Goodspeed 8a6247e34b SL-18837: Try doing necessary setup to run viewer's own build.sh. 2023-06-27 17:28:58 -04:00
Beq 783d59fcd5 Tweak to ensure best match is picked up. 2023-06-27 17:27:59 +01:00
Ansariel 9a43a8b069 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-06-27 11:42:26 +02:00
Beq 13daa0f5af Tweak linux matching 2023-06-27 02:02:51 +01:00
Brad Linden ee453bc2d9 SL-18837 fixes for test failures.
VERSION_BUILD is now too big to fit in 32 bits, and cpuid doesn't do what we expect under rosetta
2023-06-23 09:53:26 -07:00
Brad Linden bbd077bda8 SL-18837 set build id based on github workflow run id 2023-06-09 17:58:00 -07:00
Brad Linden 68a57566b7 SL-18837 fix win32 build warning about missing python-version setting 2023-06-07 17:35:13 -07:00
Brad Linden f57de07f73 Attempt to port some build.yaml improvements from DRTVWR-559 over to actions branch 2023-06-07 14:02:01 -07:00
Nat Goodspeed 8140dd050e SL-18837: Try to install llsd in the Python used by py.exe 2023-06-07 16:31:11 -04:00
Nat Goodspeed 104ae678a6 SL-18837: Tell py.exe to use Python 3.9 instead of 3.11 2023-06-07 14:54:56 -04:00
Nat Goodspeed da72e958fe SL-18837: Quote integers used for environment variables 2023-06-07 12:30:46 -04:00
Nat Goodspeed aa906a9b7f SL-18837: Try setting PY_PYTHON and PYLAUNCHER_DEBUG
which should only affect Windows unit tests, but should hopefully improve our
chances that Windows unit tests will succeed.
2023-06-07 12:17:15 -04:00
Nat Goodspeed 7a7af9a399 SL-18837: pip install llsd as well as autobuild.
The Python child processes used by llprocess_test.cpp and llleap_test.cpp need
the Python llsd module to communicate with the C++ parent process.

Also set LOGFAIL and BUGSPLAT_DB environment variables.
2023-06-05 14:35:10 -04:00
Ansariel fff08e04dd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-05-31 10:36:15 +02:00
Beq 692a86e7cf make the package match more robust. 2023-05-29 12:38:29 +01:00
Nat Goodspeed 7efe727f26 DRTVWR-558: Merge branch 'main' of secondlife/viewer into actions 2023-05-19 10:43:14 -04:00
Ansariel 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
Ansariel 38023d741e Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-05-17 18:05:14 +02:00
Nat Goodspeed 1bdea0b46f SL-18837: AUTOBUILD_GITHUB_TOKEN to authenticate private packages. 2023-05-15 11:36:08 -04:00
Beq 3b7b1c89a8 Make Nightly builds expire after 14 days 2023-05-05 00:39:09 +01:00
Beq 8874367f92 Move to MacOs11 as GitHub have stopped all the builds on 10.15 2023-05-04 18:09:07 +01:00
Beq 1f3f7f58cc Support separate webhooks by release type 2023-05-04 14:53:24 +01:00
Beq 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
Ansariel dd1940e9bc Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-05-03 10:05:23 +02:00
Ansariel 2a6c81f1d6 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-05-02 17:52:00 +02:00
Beq 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
Beq 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
Beq 5aeae33677 Step one to enable nightlies 2023-04-26 01:15:25 +01:00
Ansariel 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
Ansariel 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
Bennett Goble a0cdaa75a9 SL-18839: Add basic Github build 2023-04-10 16:17:51 -07:00
Bennett Goble 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
Ansariel 62a57b441a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-28 18:02:32 +02:00
Nat Goodspeed 8871e8d732 SL-18837: Try building Release viewer config on GH. 2023-03-24 12:02:57 -04:00
Beq 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
Ansariel 2c03c96b3e Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-07 13:23:03 +01:00
Ansariel 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
Ansariel 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
Beq 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
Beq 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
Signal Linden 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
Ansariel e2eda8c2bd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-01-25 14:41:15 +01:00
Beq 3076d01fb4 update to control build channel from branch
oops
2023-01-20 18:47:10 +00:00
Ansariel 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
Beq 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
Signal Linden 59b826e66e
Merge pull request #4 from secondlife/signal/stale
Close stale PRs
2022-11-21 16:02:02 -08:00
Ansariel dbc70be7c4 Merge branch 'master' of https://github.com/secondlife/viewer
# Conflicts:
#	README.md
#	autobuild.xml
2022-11-21 20:37:32 +01:00
Signal Linden f7f163f010
Merge pull request #3 from secondlife/signal/label
Add automatic PR labels
2022-11-18 08:42:14 -08:00
Bennett Goble 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
Bennett Goble e75104b066 Add automatic PR labels 2022-11-18 07:39:54 -08:00
Bennett Goble eaf55065e2 Add CLA bot 2022-11-18 07:30:38 -08:00
Signal Linden 3afde25ba8 Upload macos installer 2022-10-12 16:04:04 -07:00
Signal Linden d842eb9883 Build on 64-core machine 2022-10-12 15:35:28 -07:00
Signal Linden 7c4a166846 Add macOS build back 2022-10-12 15:08:00 -07:00
Signal Linden 75499351dc Build on 8-core machine 2022-10-12 15:05:11 -07:00
Signal Linden 937495863c Build on 16-core machine 2022-10-12 15:02:02 -07:00
Signal Linden aa85ed00f8 Run build with default runner 2022-10-12 14:55:42 -07:00
Signal Linden 97f84f7051 Fix YAML syntax 2022-10-12 13:15:18 -07:00
Signal Linden efb987f595 Run on windows-2022-large 2022-10-12 12:59:12 -07:00
Signal Linden 6112e92b61 Upload installer, build Release, use large runner 2022-10-12 11:49:47 -07:00
Signal Linden 8d7cde22c3 Replace llbase with llsd module 2022-10-11 15:10:04 -07:00
Signal Linden 13ab3e3f06 Omit macOS until I have a mac laptop 2022-10-11 14:17:57 -07:00
Signal Linden 271e6e367e Remove cygwin artifacts 2022-10-10 11:23:05 -07:00
Signal Linden a05c7312c5 Call load_vsvars 2022-10-10 10:54:13 -07:00
Signal Linden 82d76fc0a3 Use cygwin 2022-10-10 10:44:04 -07:00
Signal Linden 2e53204e77 Explicitly set AUTOBUILD_VSVER 2022-10-10 10:28:04 -07:00
Signal Linden 1f8671f3ac Perform source_environment 2022-10-10 10:18:21 -07:00
Signal Linden 5fadc18c6c Also build win32 with VS2k22 2022-10-10 10:02:12 -07:00
Signal Linden 7dc98ef96a Build with VS2k22 2022-10-10 10:01:27 -07:00
Signal Linden f2f9b32e75 Use pre-installed python 2022-10-10 09:57:29 -07:00
Signal Linden 6b137c7fd6 Allow CMAKE to run autobuild install 2022-10-10 09:50:40 -07:00
Signal Linden 7da93ab373 Force RelWithDebInfoOS configuration 2022-10-10 09:45:17 -07:00
Signal Linden 9a84b3923d Separate autobuild install from build 2022-10-10 09:40:32 -07:00
Signal Linden 28ec3a63b8 Pip install autobuild 2022-10-10 09:35:04 -07:00
Signal Linden 5b4846046b Add build action 2022-10-10 09:33:04 -07:00
Beq 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 Janus 2e2d500377
Create build_viewer.yml 2022-09-16 02:25:50 +01:00