Branch merge ( develop -> release )

.github/workflows/build-deploy.yml

@@ -1,9 +1,12 @@
-name: Build And Deploy
+name: Build and deploy
 on:
   push:
     branches:
       - main
       - develop
+      - release
+  workflow_dispatch:
+
 env:
   SERVICE: tks-batch
   TAG: ${{github.sha}}
@@ -44,6 +47,7 @@ jobs:
 
           if [[ ${{github.ref}} == *"develop"* ]]; then
             ( cd cicd-manifests/${SERVICE}/overlay/development && kustomize edit set image docker.io/sktcloud/${SERVICE}:${TAG} && git add kustomization.yaml )
+          elif [[ ${{github.ref}} == *"release"* ]]; then
             ( cd cicd-manifests/${SERVICE}/overlay/ft && kustomize edit set image docker.io/sktcloud/${SERVICE}:${TAG} && git add kustomization.yaml )
           elif [[ ${{github.ref}} == *"main"* ]]; then
             ( cd cicd-manifests/${SERVICE}/overlay/cicd && kustomize edit set image docker.io/sktcloud/${SERVICE}:${TAG} && git add kustomization.yaml )

.github/workflows/build.yml

@@ -1,9 +1,7 @@
-name: Build image
+name: Build only
 on:
   pull_request:
-    branches:
-      - main
-      - 'release**'
+
 env:
   SERVICE: tks-batch
   TAG: ${{github.sha}}
@@ -12,22 +10,22 @@ jobs:
   build-and-push-image:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-    - name: Login to DockerHub
-      uses: docker/login-action@v1
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-    - name: build image
-      id: docker_build
-      uses: docker/build-push-action@v2
-      with:
-        push: false
-        tags: |
-          sktcloud/${{env.SERVICE}}:${{env.TAG}}
+      - name: build image
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          push: false
+          tags: |
+            sktcloud/${{env.SERVICE}}:${{env.TAG}}

.github/workflows/golangcic-lint.yml

@@ -1,12 +1,8 @@
-name: golangci-lint
+name: Lint
 on:
   push:
-    tags:
-      - v*
-    branches:
-      - main
-      - release**
   pull_request:
+
 jobs:
   golangci:
     name: lint

.github/workflows/stale.yml

@@ -1,7 +1,7 @@
-name: 'Close stale issues and PRs'
+name: "Close stale issues and PRs"
 on:
   schedule:
-    - cron: '30 1,13 * * *'
+    - cron: "30 1,13 * * *"
 
 jobs:
   stale:
@@ -10,11 +10,11 @@ jobs:
       - uses: actions/stale@v3
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          stale-issue-message: 'This issue is stale because it has been open 7 days with no activity. Remove stale label or comment or this will be closed in 3 days.'
-          stale-pr-message: 'This PR is stale because it has been open 3 days with no activity. Remove stale label or comment or this will be closed in 3 days.'
-          close-issue-message: 'This issue was closed because it has been stalled for 5 days with no activity.'
-          close-pr-message: 'This PR was closed because it has been stalled for 10 days with no activity.'
+          stale-issue-message: "This issue is stale because it has been open 7 days with no activity. Remove stale label or comment or this will be closed in 3 days."
+          stale-pr-message: "This PR is stale because it has been open 3 days with no activity. Remove stale label or comment or this will be closed in 3 days."
+          close-issue-message: "This issue was closed because it has been stalled for 5 days with no activity."
+          close-pr-message: "This PR was closed because it has been stalled for 10 days with no activity."
           days-before-issue-stale: 7
           days-before-pr-stale: 3
           days-before-issue-close: 3
-          days-before-pr-close: 3 
+          days-before-pr-close: 3

.github/workflows/unittest.yml

@@ -1,12 +1,8 @@
+name: Unittest
 on:
   push:
-    branches:
-      - main
-      - release**
   pull_request:
-    branches:
-      - main
-      - release**
+
 jobs:
   unittest:
     runs-on: ubuntu-latest