diff --git a/composer.json b/composer.json index cf2920d..c29770e 100644 --- a/composer.json +++ b/composer.json @@ -98,5 +98,5 @@ "minimum-stability": "stable", "prefer-stable": true, "version": "26.0.2", - "build": "68" + "build": "69" } diff --git a/git_update.sh b/git_update.sh index f330d83..d62ba7c 100755 --- a/git_update.sh +++ b/git_update.sh @@ -85,6 +85,7 @@ $PHP_BIN artisan migrate --force echo "Syncing version/build to settings..." VERSION="$($PHP_BIN -r '$c=json_decode(file_get_contents("composer.json"), true); echo $c["version"] ?? "";')" BUILD="$($PHP_BIN -r '$c=json_decode(file_get_contents("composer.json"), true); echo $c["build"] ?? "";')" +echo "Computed from composer.json: VERSION=$VERSION, BUILD=$BUILD" if [[ -n "$VERSION" || -n "$BUILD" ]]; then echo "Updating settings version/build (VERSION=$VERSION, BUILD=$BUILD)..." @@ -101,6 +102,14 @@ if [[ -n "$VERSION" || -n "$BUILD" ]]; then ' \ SPEEDBB_VERSION="$VERSION" \ SPEEDBB_BUILD="$BUILD" + $PHP_BIN -r ' + require "vendor/autoload.php"; + $app = require "bootstrap/app.php"; + $app->make(Illuminate\Contracts\Console\Kernel::class)->bootstrap(); + $version = \App\Models\Setting::where("key", "version")->value("value"); + $build = \App\Models\Setting::where("key", "build")->value("value"); + echo "Settings now: version={$version}, build={$build}\n"; + ' fi echo "Update complete."