From d0b259a410bc77f6326d6b3113a271e82a7c77a8 Mon Sep 17 00:00:00 2001 From: Abid Iqbal Date: Mon, 22 May 2023 16:26:28 +0500 Subject: [PATCH 1/2] Updated workflows to run on dev branch as well --- .github/workflows/checkov.yml | 2 +- .github/workflows/deploy_xkops.yml | 2 +- .github/workflows/linter.yml | 2 +- .github/workflows/shellcheck.yml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/checkov.yml b/.github/workflows/checkov.yml index 193a0fe..ac0efe5 100644 --- a/.github/workflows/checkov.yml +++ b/.github/workflows/checkov.yml @@ -3,7 +3,7 @@ name: Checkov vulnerability scan on: pull_request: - branches: [master, main] + branches: [master, dev] jobs: build: diff --git a/.github/workflows/deploy_xkops.yml b/.github/workflows/deploy_xkops.yml index 425fc7a..2239a21 100644 --- a/.github/workflows/deploy_xkops.yml +++ b/.github/workflows/deploy_xkops.yml @@ -18,7 +18,7 @@ name: Deploy xkops to EKS on: pull_request: - branches: [master, main] + branches: [master, dev] jobs: oidc-connect: diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index faf512c..efed382 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -11,7 +11,7 @@ name: Lint Code Base ############################# on: pull_request: - branches: [master, main] + branches: [master, dev] ############### # Set the Job # diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index 9f520e5..407b0a8 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -3,6 +3,7 @@ on: pull_request: branches: - master + - dev name: "Shellcheck" permissions: {} From 7790645260d26b575956a3e5cbdee613408d4196 Mon Sep 17 00:00:00 2001 From: Abid Iqbal Date: Mon, 22 May 2023 16:33:28 +0500 Subject: [PATCH 2/2] Updated deploy on eks workflow as per new cluster --- .github/workflows/deploy_xkops.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_xkops.yml b/.github/workflows/deploy_xkops.yml index 2239a21..bea336e 100644 --- a/.github/workflows/deploy_xkops.yml +++ b/.github/workflows/deploy_xkops.yml @@ -39,7 +39,7 @@ jobs: - name: configure kubectl with eks cluster run: | - aws eks update-kubeconfig --name xkops-cluster-2 --region ap-southeast-1 + aws eks update-kubeconfig --name xkops-cluster --region ap-southeast-1 - name: Build Docker Image run: |