Merge branch 'main' into testing

This commit is contained in:
Kyle Gospodnetich 2024-01-19 16:50:25 -08:00
commit e8bfcf5283
2 changed files with 3 additions and 1 deletions

View File

@ -13,6 +13,7 @@ on:
- 'repo_content/**'
- 'spec_files/**'
- 'post_install_files/**'
- 'press_kit/**'
push:
branches:
- main
@ -24,6 +25,7 @@ on:
- 'repo_content/**'
- 'spec_files/**'
- 'post_install_files/**'
- 'press_kit/**'
merge_group:
workflow_dispatch:
env:

View File

@ -1,7 +1,7 @@
#!/usr/bin/bash
# SCRIPT VERSION
VER=14
VER=15
VER_FILE="/etc/bazzite/flatpak_manager_version"
VER_RAN=$(cat $VER_FILE)
IMAGE_INFO="/usr/share/ublue-os/image-info.json"