Commit Graph

200 Commits (b32cd27b4c1c3fbefc8ef141a450e868ae3fdc35)

Author SHA1 Message Date
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
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
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
Ansariel 0514918bed Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	scripts/messages/message_template.msg.sha1
2023-09-21 18:34:10 +02:00
Brad Linden bb7f023aaa Remove win32 build from DRTVWR-559 github build 2023-09-20 13:56:01 -07: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
Ansariel f2f79ca9ce Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	indra/newview/llvocache.cpp
#	indra/newview/pipeline.cpp
2023-09-07 15:44:27 +02: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