From 3e6a491e6795486c993a161e25770e90b4876976 Mon Sep 17 00:00:00 2001
From: tari <untari1606@gmail.com>
Date: Mon, 17 Jun 2024 14:22:45 +0800
Subject: [PATCH] fixed incorrect branches in workflows (#116)

---
 .github/workflows/docker-server.yml | 2 +-
 .github/workflows/docker_webapp.yml | 2 +-
 .github/workflows/server_style.yml  | 4 ++--
 .github/workflows/server_tests.yml  | 4 ++--
 .github/workflows/webapp.yml        | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/docker-server.yml b/.github/workflows/docker-server.yml
index c920c8ac..15326887 100644
--- a/.github/workflows/docker-server.yml
+++ b/.github/workflows/docker-server.yml
@@ -2,7 +2,7 @@ name: Docker-server-deploy
 on:
   workflow_dispatch:
   push:
-    branches: [ development, master ]
+    branches: [ development, main ]
 
 jobs:
   push_to_registry:
diff --git a/.github/workflows/docker_webapp.yml b/.github/workflows/docker_webapp.yml
index 7bfd2171..97a75dc5 100644
--- a/.github/workflows/docker_webapp.yml
+++ b/.github/workflows/docker_webapp.yml
@@ -2,7 +2,7 @@ name: Docker-webapp-deploy
 on:
   workflow_dispatch:
   push:
-    branches: [ development, master ]
+    branches: [ development, main ]
 
 jobs:
   push_to_registry:
diff --git a/.github/workflows/server_style.yml b/.github/workflows/server_style.yml
index 6f0ae492..2f8b9449 100644
--- a/.github/workflows/server_style.yml
+++ b/.github/workflows/server_style.yml
@@ -2,11 +2,11 @@ name: Server style
 on:
   workflow_dispatch:
   push:
-    branches: [ development, master ]
+    branches: [ development, main ]
     paths:
       - 'server/**'
   pull_request:
-    branches: [ development, master ]
+    branches: [ development, main ]
     paths:
       - 'server/**'
 
diff --git a/.github/workflows/server_tests.yml b/.github/workflows/server_tests.yml
index 159e73b3..ba38cd60 100644
--- a/.github/workflows/server_tests.yml
+++ b/.github/workflows/server_tests.yml
@@ -1,11 +1,11 @@
 name: Server tests
 on:
   push:
-    branches: [ development, master ]
+    branches: [ development, main ]
     paths:
       - 'server/**'
   pull_request:
-    branches: [ development, master ]
+    branches: [ development, main ]
     paths:
       - 'server/**'
   workflow_dispatch: {}
diff --git a/.github/workflows/webapp.yml b/.github/workflows/webapp.yml
index 85d429c0..b15a82ff 100644
--- a/.github/workflows/webapp.yml
+++ b/.github/workflows/webapp.yml
@@ -2,11 +2,11 @@ name: webapp
 
 on:
   push:
-    branches: [ dev, stable, prod ]
+    branches: [ development, main ]
     paths:
       - 'webapp/**'
   pull_request:
-    branches: [ dev, stable, prod ]
+    branches: [ development, main ]
     paths:
       - 'webapp/**'