Compare commits

..

7 Commits

5 changed files with 18 additions and 10 deletions

View File

@ -1,5 +1,14 @@
# Changelog # Changelog
## [1.1.0] - 2025-02-16
### Changed
- clean up changelog and update script execution in platformio.ini
- update changelog for version 1.1.0
### Fixed
- correct version number in nav bar
## [1.0.5] - 2025-02-16 ## [1.0.5] - 2025-02-16
### Added ### Added
- update version to 1.0.5 and enhance changelog update process with automatic git push - update version to 1.0.5 and enhance changelog update process with automatic git push

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;"> <div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo"> <img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text"> <div class="logo-text">
<h1>FilaMan<span class="version">v1.0.2</span></h1> <h1>FilaMan<span class="version">v1.0.9</span></h1>
<h4>Filament Management Tool</h4> <h4>Filament Management Tool</h4>
</div> </div>
</div> </div>

View File

@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html ; https://docs.platformio.org/page/projectconf.html
[common] [common]
version = "1.0.8" version = "1.1.0"
[env:esp32dev] [env:esp32dev]
platform = espressif32 platform = espressif32
@ -48,9 +48,9 @@ build_flags =
'-D VERSION="${common.version}"' '-D VERSION="${common.version}"'
extra_scripts = extra_scripts =
pre:scripts/combine_html.py
pre:scripts/pre_build.py pre:scripts/pre_build.py
pre:scripts/combine_html.py
pre:scripts/pre_spiffs.py pre:scripts/pre_spiffs.py
pre:scripts/gzip_files.py pre:scripts/gzip_files.py
pre:scripts/extra_script.py pre:scripts/extra_script.py
pre:scripts/update_changelog.py #post:scripts/update_changelog.py

View File

@ -13,6 +13,9 @@ def copy_file(input_file, output_file):
shutil.copy2(input_file, output_file) shutil.copy2(input_file, output_file)
def should_compress(file): def should_compress(file):
# Skip compression for spoolman.html
if file == 'spoolman.html':
return False
# Komprimiere nur bestimmte Dateitypen # Komprimiere nur bestimmte Dateitypen
return file.endswith(('.js', '.png', '.css', '.html')) return file.endswith(('.js', '.png', '.css', '.html'))

View File

@ -78,19 +78,15 @@ def push_changes(version):
subprocess.run(['git', 'push', 'origin'], check=True) subprocess.run(['git', 'push', 'origin'], check=True)
print("Successfully pushed to origin") print("Successfully pushed to origin")
# Ask for upstream push
response = input("Do you want to push to GitHub (upstream)? (y/n): ").lower()
if response == 'y':
subprocess.run(['git', 'push', 'upstream'], check=True)
print("Successfully pushed to upstream")
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
print(f"Error during git operations: {e}") print(f"Error during git operations: {e}")
return False return False
return True return True
def update_changelog(): def update_changelog():
print("Starting changelog update...") # Add this line
version = get_version() version = get_version()
print(f"Current version: {version}") # Add this line
today = datetime.now().strftime('%Y-%m-%d') today = datetime.now().strftime('%Y-%m-%d')
script_dir = os.path.dirname(os.path.abspath(__file__)) script_dir = os.path.dirname(os.path.abspath(__file__))