From 1b627da61c3ed1234bdd2d5a89acf222b2e9eb20 Mon Sep 17 00:00:00 2001
From: tueem <tueem@tomatentum.net>
Date: Fri, 18 Oct 2024 23:35:21 +0200
Subject: [PATCH] remove second job and fix format

---
 .gitea/workflows/build.yaml  |  3 +--
 .gitea/workflows/deploy.yaml | 21 +++++++++------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 316c921..b819254 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -1,8 +1,7 @@
 name: Test build
 on: 
   - push:
-    - branches-ignore:
-      - master
+    - branches-ignore: [master]
 
 jobs:
   Build-Docker:
diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 7fa02ec..9fe76e6 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -1,12 +1,11 @@
 name: Deploy
 on:
   - push:
-    - branches:
-      - master
+    - branches: [master]
 
 
 jobs:
-  Build-Docker:
+  BuildandPush-Docker:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
@@ -15,12 +14,10 @@ jobs:
         uses: docker/setup-buildx-action@v2
       - name: Build Docker Image
         run: docker buildx build -t ${{ vars.DOCKER_TAG }} .
-      
-  Push-Docker:
-    - name: Log in to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-    - name: Push Docker image
-      run: docker push ${{ vars.DOCKER_TAG }}
\ No newline at end of file
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Push Docker image
+        run: docker push ${{ vars.DOCKER_TAG }}
\ No newline at end of file