From 6c2afeac8d92cacb7ab8967b9997c9042ef794d7 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Wed, 3 May 2023 22:17:52 +0100
Subject: [PATCH] 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
---
 .github/workflows/build_viewer.yml |  1 +
 fsutils/download_list.py           | 15 ++++++++-------
 requirements.txt                   |  5 +++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml
index 8adec3ef10..ba170a59f8 100644
--- a/.github/workflows/build_viewer.yml
+++ b/.github/workflows/build_viewer.yml
@@ -10,6 +10,7 @@ env:
   AUTOBUILD_VARIABLES_FILE: ${{github.workspace}}/build-variables/variables
   EXTRA_ARGS: -DUSE_FMODSTUDIO=ON -DUSE_KDU=ON --crashreporting
   build_secrets_checkout: ${{github.workspace}}/signing
+  XZ_DEFAULTS: -T0
 
 
 jobs:
diff --git a/fsutils/download_list.py b/fsutils/download_list.py
index b8534efeff..489ecb7202 100644
--- a/fsutils/download_list.py
+++ b/fsutils/download_list.py
@@ -211,6 +211,10 @@ for build_type in build_types_created:
     grids_printable = {"SL":"Second Life", "OS":"OpenSim"}
 
     download_root = f"https://downloads.firestormviewer.org/{build_types[build_type]}/"
+    output += f'''
+DOWNLOADS - {build_type}
+-------------------------------------------------------------------------------------------------------
+'''
     for dir in dirs:
         print(f"Getting files for {dir} in {build_type_dir}")
         files = get_files(os.path.join(build_type_dir, dir))
@@ -236,11 +240,8 @@ for build_type in build_types_created:
             print(f"No files found for {dir} in {build_type_dir}")
 
 
-        output += f'''
-DOWNLOADS - {build_type}
-'''
 
-        output += f'''-------------------------------------------------------------------------------------------------------
+        output += f'''
 {platforms_printable[dir]}
 '''
         dir = dir.lower()
@@ -266,8 +267,7 @@ DOWNLOADS - {build_type}
             except KeyError:
                 output += f"{platform} for {grid_printable} ({wordsize}-bit) - NOT AVAILABLE\n"
                 output += "\n"
-        output += '''
--------------------------------------------------------------------------------------------------------
+        output += '''-------------------------------------------------------------------------------------------------------
 '''
 
     if args.webhook:
@@ -276,6 +276,7 @@ DOWNLOADS - {build_type}
         # Send the webhook
         response = webhook.execute()
         # Print the response
-        print(f"Webhook response: {response}")
+        if not response.ok:
+            print(f"Webhook Error {response.status_code}: {response.text}")        
     print(output)
 
diff --git a/requirements.txt b/requirements.txt
index 9272ca6a2c..5ed33066fd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
-llbase==1.2.11
-git+https://github.com/FirestormViewer/autobuild-3.0#egg=autobuild
+llbase>=1.2.11
+autobuild>=3.9.1
+# git+https://github.com/FirestormViewer/autobuild-3.0#egg=autobuild
 # git+https://github.com/Nicky-D/autobuild@main_nd#egg=autobuild
\ No newline at end of file