Enable Docker Build / Automated test runs

rix1337 · Jul 29, 2023 · 80fa878 · 80fa878
1 parent 50bb747
commit 80fa878
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 27 deletions.
diff --git a/.github/Changelog.md b/.github/Changelog.md
@@ -5,3 +5,5 @@
 ---
 
 ### Changelog BudgeTeer:
+- Add automated Docker build
+- Enable version check
diff --git a/.github/workflows/CreateRelease.yml b/.github/workflows/CreateRelease.yml
@@ -110,3 +110,6 @@ jobs:
       - name: Upload to PyPI
         run: |
           python -m twine upload ./artifact-wheel/* -u __token__ -p ${{ secrets.PYPI_TOKEN }}
+      - name: Trigger Docker Image build
+        run: |
+          curl -XPOST -u "${{ secrets.CR_USER }}:${{secrets.CR_PAT}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/rix1337/docker-budgeteer/actions/workflows/BuildImage.yml/dispatches --data '{"ref": "main", "inputs": {"version": "${{ steps.version.outputs.version }}"}"}'
diff --git a/budgeteer/budget.py b/budgeteer/budget.py
@@ -30,6 +30,7 @@ def start_budgeteer():
         parser.add_argument("--log-level", help="Legt fest, wie genau geloggt wird (INFO, DEBUG)")
         parser.add_argument("--config", help="Legt den Ablageort für Einstellungen und Logs fest")
         parser.add_argument("--port", help="Legt den Port des Webservers fest")
+        parser.add_argument("--test_run", action='store_true', help="Intern: Führt einen Testlauf durch")
         parser.add_argument("--docker", action='store_true',
                             help="Intern: Sperre Pfad und Port auf Docker-Standardwerte")
         arguments = parser.parse_args()
@@ -80,8 +81,13 @@ def start_budgeteer():
         BudgetConfig("BudgeTeer").remove_redundant_entries()
         remove_redundant_db_tables(shared_state.values["dbfile"])
 
-        process_web_server = multiprocessing.Process(target=web_server, args=(shared_state_dict, shared_state_lock,))
-        process_web_server.start()
+        if not arguments.test_run:
+            process_web_server = multiprocessing.Process(target=web_server,
+                                                         args=(shared_state_dict, shared_state_lock,))
+            process_web_server.start()
+        else:
+            print("Testlauf aktiviert, Webserver wird nicht gestartet")
+            sys.exit(0)
 
         def signal_handler(sig, frame):
             process_web_server.terminate()

diff --git a/budgeteer/providers/version.py b/budgeteer/providers/version.py
@@ -9,7 +9,7 @@
 
 
 def get_version():
-    return "0.0.1"
+    return "0.0.2"
 
 
 def create_version_file():

diff --git a/budgeteer/web_interface/vuejs_frontend/package-lock.json b/budgeteer/web_interface/vuejs_frontend/package-lock.json
diff --git a/budgeteer/web_interface/vuejs_frontend/package.json b/budgeteer/web_interface/vuejs_frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "budgeteer-web",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "scripts": {
     "dev": "vite",
     "build": "vite build",

diff --git a/budgeteer/web_interface/vuejs_frontend/src/components/Head.vue b/budgeteer/web_interface/vuejs_frontend/src/components/Head.vue
@@ -8,8 +8,8 @@ const store = useStore()
 const toast = useToast()
 
 onMounted(() => {
-  //getVersion()
-  //setInterval(getVersion, 300 * 1000)
+  getVersion()
+  setInterval(getVersion, 300 * 1000)
 })
 
 function openReleaseNotes() {

diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@
     version=get_version(),
     author="rix1337",
     author_email="",
-    description="Automate downloads using predefined sites and the My JDownloader API",
+    description="Einfacher Überblick über das eigene Budget",
     long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://github.com/rix1337/BudgeTeer",