From 96f7f708c1d3c45686ae2ac6c7928e092f55eb0f Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Fri, 10 Nov 2023 01:57:27 +0200 Subject: [PATCH 1/7] SL-20591 Update viewer-manager to v3.0.0395b15 --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 3fa15ecbf8..ca39775ebf 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2471,11 +2471,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - e04567dc13483288d7226ed22404984d783d35e1 + 4e8f4db5deceb0a6924a49857d3cabc873eba623 hash_algorithm sha1 url - https://github.com/secondlife/viewer-manager/releases/download/v3.0-074736e/viewer_manager-3.0-074736e-darwin64-074736e.tar.zst + https://github.com/secondlife/viewer-manager/releases/download/v3.0.0395b15/viewer_manager-3.0.0395b15-darwin64-0395b15.tar.zst name darwin64 @@ -2485,11 +2485,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 42e86beb8b3bd2f4300a80c7c69e0cfda421ccbb + d22f9bcc73c1fe00534d3ca70c466b27dfe0e70e hash_algorithm sha1 url - https://github.com/secondlife/viewer-manager/releases/download/v3.0-074736e/viewer_manager-3.0-074736e-linux64-074736e.tar.zst + https://github.com/secondlife/viewer-manager/releases/download/v3.0.0395b15/viewer_manager-3.0.0395b15-linux64-0395b15.tar.zst name linux64 @@ -2499,11 +2499,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - bb4d86b3a8e9fb6b688e555050302e0ed41dd41e + ff06241bd022a96f1b242b5e2aa170433cdf8b4f hash_algorithm sha1 url - https://github.com/secondlife/viewer-manager/releases/download/v3.0-074736e/viewer_manager-3.0-074736e-windows64-074736e.tar.zst + https://github.com/secondlife/viewer-manager/releases/download/v3.0.0395b15/viewer_manager-3.0.0395b15-windows64-0395b15.tar.zst name windows64 From 2f735f69099c1100995642a6ec2e7c3b66a383b8 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 17 Nov 2023 02:33:53 +0200 Subject: [PATCH 2/7] SL-20591 Update viewer-manager to v3.0.73fef89 --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index ca39775ebf..aff2017580 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2471,11 +2471,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 4e8f4db5deceb0a6924a49857d3cabc873eba623 + 30e4b77c86baae7885af692a1f9e9601f2e9d442 hash_algorithm sha1 url - https://github.com/secondlife/viewer-manager/releases/download/v3.0.0395b15/viewer_manager-3.0.0395b15-darwin64-0395b15.tar.zst + https://github.com/secondlife/viewer-manager/releases/download/v3.0.73fef89/viewer_manager-3.0.73fef89-darwin64-73fef89.tar.zst name darwin64 @@ -2485,11 +2485,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - d22f9bcc73c1fe00534d3ca70c466b27dfe0e70e + cb838349fc908d87e5bdebb44942bf7558b9f0ee hash_algorithm sha1 url - https://github.com/secondlife/viewer-manager/releases/download/v3.0.0395b15/viewer_manager-3.0.0395b15-linux64-0395b15.tar.zst + https://github.com/secondlife/viewer-manager/releases/download/v3.0.73fef89/viewer_manager-3.0.73fef89-linux64-73fef89.tar.zst name linux64 @@ -2499,11 +2499,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - ff06241bd022a96f1b242b5e2aa170433cdf8b4f + 0830850ea21b48f9da7b933df85a3330570f8918 hash_algorithm sha1 url - https://github.com/secondlife/viewer-manager/releases/download/v3.0.0395b15/viewer_manager-3.0.0395b15-windows64-0395b15.tar.zst + https://github.com/secondlife/viewer-manager/releases/download/v3.0.73fef89/viewer_manager-3.0.73fef89-windows64-73fef89.tar.zst name windows64 @@ -2516,7 +2516,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors copyright Copyright (c) 2000-2012, Linden Research, Inc. version - 3.0-074736e + 3.0-73fef89 name viewer-manager description From 9b50c50bf2fe3fab2dbb0bcd18d7c8f5b9a13a1b Mon Sep 17 00:00:00 2001 From: Bennett Goble Date: Sun, 19 Nov 2023 19:35:40 -0800 Subject: [PATCH 3/7] 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. --- .github/workflows/build.yaml | 48 +++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1cd0c2526f..d1737eeda4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -330,29 +330,29 @@ jobs: steps: - uses: actions/download-artifact@v3 with: - path: artifacts + name: Windows-installer - - name: Reshuffle artifact files - uses: secondlife/viewer-build-util/release-artifacts@main + - uses: actions/download-artifact@v3 with: - input-path: artifacts - output-path: assets - # The *-app artifacts are for use only by the signing and - # packaging steps. Once we've generated signed installers, we no - # longer need them, and we CERTAINLY don't want to publish - # thousands of individual files as separate URLs. - exclude: |- - Windows-app - macOS-app - # Use just "Windows" or "macOS" prefix because these are the only - # artifacts in which we expect files from both platforms with - # colliding names (e.g. autobuild-package.xml). release-artifacts - # normally resolves collisions by prepending the artifact name, so - # when we anticipate collisions, it's good to keep the prefix - # short and sweet. - prefix: |- - Windows-metadata=Windows - macOS-metadata=macOS + name: macOS-installer + + - uses: actions/download-artifact@v3 + with: + name: Windows-metadata + + - name: Rename windows metadata + run: | + mv autobuild-package.xml Windows-autobuild-package.xml + mv newview/viewer_version.txt Windows-viewer_version.txt + + - uses: actions/download-artifact@v3 + with: + name: macOS-metadata + + - name: Rename macOS metadata + run: | + mv autobuild-package.xml macOS-autobuild-package.xml + mv newview/viewer_version.txt macOS-viewer_version.txt # forked from softprops/action-gh-release - uses: secondlife-3p/action-gh-release@v1 @@ -364,4 +364,8 @@ jobs: generate_release_notes: true # the only reason we generate a GH release is to post build products fail_on_unmatched_files: true - files: "assets/*" + files: | + *.dmg + *.exe + *-autobuild-package.xml + *-viewer_version.txt From 972bf55d4bcfc6c9a20fc8d4bc825799178553cf Mon Sep 17 00:00:00 2001 From: Bennett Goble Date: Mon, 20 Nov 2023 08:18:14 -0800 Subject: [PATCH 4/7] Ignore .vscode Add the commonly autocreated .vscode directory to .gitignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f0b5f86211..21f58d5227 100755 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ web/locale.* web/secondlife.com.* .env +.vscode From c0ab8b8f0cb1fb0b02bb42b5f7b2e8709bee5415 Mon Sep 17 00:00:00 2001 From: Bennett Goble Date: Mon, 20 Nov 2023 16:23:05 -0800 Subject: [PATCH 5/7] 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. --- .github/workflows/build.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1cd0c2526f..d8b9b5e8e0 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -254,7 +254,7 @@ jobs: runs-on: windows steps: - name: Sign and package Windows viewer - uses: secondlife/viewer-build-util/sign-pkg-windows@main + uses: secondlife/viewer-build-util/sign-pkg-windows@v1 with: vault_uri: "${{ secrets.AZURE_KEY_VAULT_URI }}" cert_name: "${{ secrets.AZURE_CERT_NAME }}" @@ -286,7 +286,7 @@ jobs: [[ -n "$USERNAME" && -n "$PASSWORD" && -n "$TEAM_ID" ]] - name: Sign and package Mac viewer - uses: secondlife/viewer-build-util/sign-pkg-mac@main + uses: secondlife/viewer-build-util/sign-pkg-mac@v1 with: channel: ${{ needs.build.outputs.viewer_channel }} imagename: ${{ needs.build.outputs.imagename }} @@ -302,7 +302,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Post Windows symbols - uses: secondlife/viewer-build-util/post-bugsplat-windows@main + uses: secondlife/viewer-build-util/post-bugsplat-windows@v1 with: username: ${{ secrets.BUGSPLAT_USER }} password: ${{ secrets.BUGSPLAT_PASS }} @@ -315,7 +315,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Post Mac symbols - uses: secondlife/viewer-build-util/post-bugsplat-mac@main + uses: secondlife/viewer-build-util/post-bugsplat-mac@v1 with: username: ${{ secrets.BUGSPLAT_USER }} password: ${{ secrets.BUGSPLAT_PASS }} @@ -333,7 +333,7 @@ jobs: path: artifacts - name: Reshuffle artifact files - uses: secondlife/viewer-build-util/release-artifacts@main + uses: secondlife/viewer-build-util/release-artifacts@v1 with: input-path: artifacts output-path: assets From a963ba296ef233a8f7e9c097e21c91d3774c2c52 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 21 Nov 2023 19:33:54 +0200 Subject: [PATCH 6/7] SL-20591 Update viewer-manager to v3.0.0170afb Restored removed commits since issue was isolated and bypassed. Original issue: win32util.py imports wmi, if import fails it uses registry for getting dns, if import works, it uses wmi to get dns. Including wmi broke dns for some of the users ([Errno 11001] Name or service not known) --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index aff2017580..3a64075c85 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2471,11 +2471,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 30e4b77c86baae7885af692a1f9e9601f2e9d442 + c859f1d1d026378852930427148b38f2f8a583b0 hash_algorithm sha1 url - https://github.com/secondlife/viewer-manager/releases/download/v3.0.73fef89/viewer_manager-3.0.73fef89-darwin64-73fef89.tar.zst + https://github.com/secondlife/viewer-manager/releases/download/v3.0.0170afb/viewer_manager-3.0-0170afb-darwin64-0170afb.tar.zst name darwin64 @@ -2485,11 +2485,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - cb838349fc908d87e5bdebb44942bf7558b9f0ee + 674202847aad5d949f83451c9366db18a4dfe902 hash_algorithm sha1 url - https://github.com/secondlife/viewer-manager/releases/download/v3.0.73fef89/viewer_manager-3.0.73fef89-linux64-73fef89.tar.zst + https://github.com/secondlife/viewer-manager/releases/download/v3.0.0170afb/viewer_manager-3.0-0170afb-linux64-0170afb.tar.zst name linux64 @@ -2499,11 +2499,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 0830850ea21b48f9da7b933df85a3330570f8918 + 6c68b195d6c8218788f129643a1c8472f5b609d0 hash_algorithm sha1 url - https://github.com/secondlife/viewer-manager/releases/download/v3.0.73fef89/viewer_manager-3.0.73fef89-windows64-73fef89.tar.zst + https://github.com/secondlife/viewer-manager/releases/download/v3.0.0170afb/viewer_manager-3.0-0170afb-windows64-0170afb.tar.zst name windows64 @@ -2516,7 +2516,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors copyright Copyright (c) 2000-2012, Linden Research, Inc. version - 3.0-73fef89 + 3.0-0170afb name viewer-manager description From 974a2a1d4093263312137fd419ee13675cbe3f4a Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 22 Nov 2023 14:12:46 -0500 Subject: [PATCH 7/7] DRTVWR-587: Update to viewer-manager v3.0-08bf5ee. This viewer-manager refactors the bad-graphics-card detection. --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 3a64075c85..22cbfd58c9 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2471,11 +2471,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - c859f1d1d026378852930427148b38f2f8a583b0 + eb1316584188dafb591f80b46b357c737f90d1a7 hash_algorithm sha1 url - https://github.com/secondlife/viewer-manager/releases/download/v3.0.0170afb/viewer_manager-3.0-0170afb-darwin64-0170afb.tar.zst + https://github.com/secondlife/viewer-manager/releases/download/v3.0-08bf5ee/viewer_manager-3.0-08bf5ee-darwin64-08bf5ee.tar.zst name darwin64 @@ -2485,11 +2485,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 674202847aad5d949f83451c9366db18a4dfe902 + f4677b0ebd9880f29c118af51ada50883dd0a1e4 hash_algorithm sha1 url - https://github.com/secondlife/viewer-manager/releases/download/v3.0.0170afb/viewer_manager-3.0-0170afb-linux64-0170afb.tar.zst + https://github.com/secondlife/viewer-manager/releases/download/v3.0-08bf5ee/viewer_manager-3.0-08bf5ee-linux64-08bf5ee.tar.zst name linux64 @@ -2499,11 +2499,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 6c68b195d6c8218788f129643a1c8472f5b609d0 + 7426c5a1d7eb231b476625637a1f2daba0a6bc55 hash_algorithm sha1 url - https://github.com/secondlife/viewer-manager/releases/download/v3.0.0170afb/viewer_manager-3.0-0170afb-windows64-0170afb.tar.zst + https://github.com/secondlife/viewer-manager/releases/download/v3.0-08bf5ee/viewer_manager-3.0-08bf5ee-windows64-08bf5ee.tar.zst name windows64 @@ -2516,7 +2516,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors copyright Copyright (c) 2000-2012, Linden Research, Inc. version - 3.0-0170afb + 3.0-08bf5ee name viewer-manager description