From 0881176092c63ff6e88df32665b29106efa029a8 Mon Sep 17 00:00:00 2001
From: Aurora <5505558+duggalsu@users.noreply.github.com>
Date: Tue, 5 Mar 2024 14:39:50 +0530
Subject: [PATCH] ci: Fix secrets access - Removed conditional on merge main
 workflow - Removed environment label from merge dev hotfix workflow -
 Modified docker secrets name

---
 .github/workflows/merge-dev-hotfix.yml | 6 ++----
 .github/workflows/merge-main.yml       | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/merge-dev-hotfix.yml b/.github/workflows/merge-dev-hotfix.yml
index 43d60b9f..7f3bba18 100644
--- a/.github/workflows/merge-dev-hotfix.yml
+++ b/.github/workflows/merge-dev-hotfix.yml
@@ -12,8 +12,6 @@ jobs:
   if_merged:
     if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
-    environment:
-      name: staging
 
     steps:
       - name: Checkout code
@@ -35,7 +33,7 @@ jobs:
         uses: elgohr/Publish-Docker-Github-Action@main
         with:
           username: tattletech
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          password: ${{ secrets.DOCKER_PWD }}
           name: tattletech/feluda-operator-vidvec
           workdir: src/
           dockerfile: benchmark/vidvec/Dockerfile.vid_vec_rep_resnet
@@ -46,7 +44,7 @@ jobs:
         uses: elgohr/Publish-Docker-Github-Action@main
         with:
           username: tattletech
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          password: ${{ secrets.DOCKER_PWD }}
           name: tattletech/feluda-operator-vidvec
           workdir: src/
           dockerfile: benchmark/vidvec/Dockerfile.vid_vec_rep_resnet.graviton
diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml
index 2e532c92..4af5aeae 100644
--- a/.github/workflows/merge-main.yml
+++ b/.github/workflows/merge-main.yml
@@ -50,7 +50,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Publish vidvec amd64 benchmark to dockerhub
-        if: steps.release.outcome == 'success'
+        #if: steps.release.outcome == 'success'
         uses: elgohr/Publish-Docker-Github-Action@main
         with:
           username: tattletech
@@ -62,7 +62,7 @@ jobs:
           platforms: linux/amd64
 
       - name: Publish vidvec arm64 benchmark to dockerhub
-        if: steps.release.outcome == 'success'
+        #if: steps.release.outcome == 'success'
         uses: elgohr/Publish-Docker-Github-Action@main
         with:
           username: tattletech
@@ -74,7 +74,7 @@ jobs:
           platforms: linux/arm64
 
 #      - name: Publish vidvec amd64 worker to dockerhub
-#        if: steps.release.outcome == 'success'
+#        #if: steps.release.outcome == 'success'
 #        uses: elgohr/Publish-Docker-Github-Action@main
 #        with:
 #          username: tattletech