[Flightgear-commitlogs] [FGMeta] branch release/2024.1 updated: Also upload FGData to Storage

[<fli...@li...>]

unknown user pushed a commit to branch release/2024.1
in repository fgmeta.

The following commit(s) were added to refs/heads/release/2024.1 by this push:
     new e8c5e9e  Also upload FGData to Storage
e8c5e9e is described below

SF URL:  http://sourceforge.net/p/flightgear/fgmeta/ci/e8c5e9e32a2f597fa45f75dfa597dfa77ad26553/

Commit:    e8c5e9e32a2f597fa45f75dfa597dfa77ad26553
Author:    James Turner
Committer: James Turner
AuthorDate:    Sat Aug 1 16:01:36 2026 +0100

Also upload FGData to Storage




---
 release_builder/create_base_package.sh | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/release_builder/create_base_package.sh b/release_builder/create_base_package.sh
index 4a6a794..198d28e 100755
--- a/release_builder/create_base_package.sh
+++ b/release_builder/create_base_package.sh
@@ -25,10 +25,8 @@ VERSION=`cat fgdata/version`
 SCENERY_PACK_AIRPORT=BIKF
 SCENERY_PACK_URI="https://sourceforge.net/projects/flightgear/files/scenery/SceneryPack.${SCENERY_PACK_AIRPORT}.tgz/download"
 FGDATA_NAME="fgdata_2024_1"
-STORAGE_BUCKET="terrasync-fgdata"
-
-# Expose the Bunny secret under the name that rclone expects when using env_auth=true
-AWS_SECRET_ACCESS_KEY=$BUNNY_FGDATA_SECRET
+TERRSASYNC_BUCKET="terrasync-fgdata"
+DOWNLOAD_BUCKET="fgdata-download"
 
 echo "Assembling base package for $VERSION"
 cd $WORKSPACE
@@ -73,11 +71,14 @@ cat << _end_ > "staging/$FGDATA_NAME/base_package.json"
 }
 _end_
 
+# expose the Bunny secret under the name that rclone expects when using env_auth=true
+export AWS_SECRET_ACCESS_KEY=$BUNNY_FGDATA_SECRET
+
 # rsync current dir-indexes, so we don't create new ones if contents have not changed. This
 # is important since new dir index files get a comment which changes their SHA sum
 
 # TODO: remove `.dirindex` include once new files exist
-rclone copy --include "**/.dirindex" --include "**/dirindex.txt" bunny-fgdata:terrasync-fgdata/$FGDATA_NAME/ previous-dirindex/
+rclone copy --include "**/.dirindex" --include "**/dirindex.txt" bunny-fgdata:$TERRSASYNC_BUCKET/$FGDATA_NAME/ previous-dirindex/
 
 echo "Computing dir-indexes"
 .venv/bin/create_dirindex.py --date=now --old-dir="previous-dirindex/$FGDATA_NAME" --legacy-indices "staging/$FGDATA_NAME"
@@ -85,9 +86,8 @@ echo "Computing dir-indexes"
 # Creating full base package TXZ
 # import we re-apply excludes here, so that the root dirindex is skipped
 
-export XZ_OPT="-T0" # multiple threads
 OUTPUT_NAME=output/FlightGear-$VERSION-data.txz
-tar -cJf "${WORKSPACE}/$OUTPUT_NAME" --exclude-from=release_builder/base_package_excludes --directory staging $FGDATA_NAME
+tar -cf "${WORKSPACE}/$OUTPUT_NAME" --use-compress-program="xz -T0" --exclude-from=release_builder/base_package_excludes --directory staging $FGDATA_NAME
 
 echo "Done, data TXZs are in output/"
 
@@ -107,9 +107,15 @@ scp $OUTPUT_NAME jm...@de...:/var/www/download-flightgear/relea
 # zip file only goes to download.flightgear.org
 scp $ZIP_OUTPUT_NAME jm...@de...:/var/www/download-flightgear/release-2024.1/
 
+# juggle keys back and forth for auth :(
+export AWS_SECRET_ACCESS_KEY=$BUNNY_DLDATA_SECRET
+
+rclone copy --progress "$OUTPUT_NAME" bunny-dldata:$DOWNLOAD_BUCKET/$FGDATA_NAME/
 echo "Done uploading TXZ, now sync-ing files to the CDN"
 
+export AWS_SECRET_ACCESS_KEY=$BUNNY_FGDATA_SECRET
+
 # `--checksum` arg is important so we don't touch / modify unchanged files on the server side.
-rclone sync --checksum staging/$FGDATA_NAME bunny-fgdata:terrasync-fgdata/$FGDATA_NAME --progress
+rclone sync --checksum --progress staging/$FGDATA_NAME bunny-fgdata:terrasync-fgdata/$FGDATA_NAME
 
 echo "Finished"