From 1f86a99f7a84a9b79aa4eca6e761a4700509297f Mon Sep 17 00:00:00 2001
From: rajdip-b <agentR47@gmail.com>
Date: Fri, 9 Feb 2024 11:41:58 +0530
Subject: [PATCH] chore(ci): moving to gitflow release

---
 .github/workflows/api.yaml    | 24 +-----------------------
 .github/workflows/release.yml |  1 -
 .github/workflows/web.yaml    | 24 +-----------------------
 package.json                  |  6 +-----
 4 files changed, 3 insertions(+), 52 deletions(-)

diff --git a/.github/workflows/api.yaml b/.github/workflows/api.yaml
index dd70b2e7..bce1f852 100644
--- a/.github/workflows/api.yaml
+++ b/.github/workflows/api.yaml
@@ -92,33 +92,11 @@ jobs:
       - name: Deploy to stage
         run: ~/.fly/bin/fly deploy --config fly.api.toml --dockerfile ./apps/api/Dockerfile --app keyshade-api-stage --access-token ${{ secrets.FLY_ACCESS_TOKEN }}
 
-  build-api-alpha:
-    needs: validate
-    runs-on: ubuntu-latest
-    name: Build and push API docker image for alpha
-    if: ${{ startsWith(github.ref , 'refs/tags/') && contains(github.ref, 'alpha') }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Build Docker image
-        run: docker build -t keyshade/keyshade-api:${{ github.ref_name }} keyshade/keyshade-api:alpha-latest -f ./apps/api/Dockerfile .
-
-      - name: Push Docker image
-        run: docker push keyshade/keyshade-api
-
   build-api-release:
     needs: validate
     runs-on: ubuntu-latest
     name: Build and push API docker image for release
-    if: ${{ startsWith(github.ref , 'refs/tags/') && !contains(github.ref, 'alpha') }}
+    if: ${{ startsWith(github.ref , 'refs/tags/')}}
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 62b2affc..7a591557 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - alpha
 
 jobs:
   release:
diff --git a/.github/workflows/web.yaml b/.github/workflows/web.yaml
index 05f18d87..72cd556d 100644
--- a/.github/workflows/web.yaml
+++ b/.github/workflows/web.yaml
@@ -73,33 +73,11 @@ jobs:
       - name: Deploy to stage
         run: ~/.fly/bin/fly deploy --config fly.web.toml --dockerfile ./apps/web/Dockerfile --app keyshade-web --access-token ${{ secrets.FLY_ACCESS_TOKEN }}
 
-  build-web-alpha:
-    needs: validate
-    runs-on: ubuntu-latest
-    name: Build and push Web docker image for alpha
-    if: ${{ startsWith(github.ref , 'refs/tags/') && contains(github.ref, 'alpha') }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Build Docker image
-        run: docker build -t keyshade/keyshade-web:${{ github.ref_name }} keyshade/keyshade-web:alpha-latest -f ./apps/web/Dockerfile .
-
-      - name: Push Docker image
-        run: docker push keyshade/keyshade-web
-
   build-web-release:
     needs: validate
     runs-on: ubuntu-latest
     name: Build and push Web docker image for release
-    if: ${{ startsWith(github.ref , 'refs/tags/') && !contains(github.ref, 'alpha') }}
+    if: ${{ startsWith(github.ref , 'refs/tags/') }}
 
     steps:
       - name: Checkout
diff --git a/package.json b/package.json
index 3cd51ef7..f6d1b7bd 100644
--- a/package.json
+++ b/package.json
@@ -5,11 +5,7 @@
   "private": true,
   "release": {
     "branches": [
-      "main",
-      {
-        "name": "alpha",
-        "prerelease": true
-      }
+      "main"
     ],
     "plugins": [
       [