From 7ed1e2958e39f1e74438c4e8d651f7f2dcc31c68 Mon Sep 17 00:00:00 2001
From: Ilia Akimov <cwarck@gmail.com>
Date: Tue, 13 May 2025 09:17:45 +0200
Subject: [PATCH 1/4] feat: add ci build and push

---
 .github/workflows/deploy.yaml | 36 +++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 .github/workflows/deploy.yaml

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
new file mode 100644
index 0000000..103b68a
--- /dev/null
+++ b/.github/workflows/deploy.yaml
@@ -0,0 +1,36 @@
+name: Deploy
+
+on:
+  push:
+    branches: [main, feat-ci-build-push]
+
+jobs:
+  build-push:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: 'read'
+      id-token: 'write'
+
+    steps:
+    - uses: 'actions/checkout@v4'
+
+    - uses: 'google-github-actions/auth@v2'
+      with:
+        project_id: '${{ env.GCP_PROJECT_ID }}'
+        workload_identity_provider: 'projects/${{ env.GCP_PROJECT_NUMBER }}/locations/global/workloadIdentityPools/github/providers/github-cwarck-hfe-bot'
+    
+    - name: 'Set up Cloud SDK'
+      uses: 'google-github-actions/setup-gcloud@v2'
+      with:
+        version: '>= 363.0.0'
+
+    - name: 'Docker auth'
+      run: |-
+        gcloud auth configure-docker ${{ env.GAR_LOCATION }}-docker.pkg.dev
+    
+    - name: 'Build and push image'
+      run: |-
+        IMAGE="${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.GCP_PROJECT_ID }}/hfe-bot:${{ github.sha }}"
+        docker build -t $IMAGE .
+        docker push $IMAGE

From 8299bca559826549798aa4ef345e1235c2317ecd Mon Sep 17 00:00:00 2001
From: Ilia Akimov <cwarck@gmail.com>
Date: Tue, 13 May 2025 21:33:35 +0200
Subject: [PATCH 2/4] Use vars context to access project vars

---
 .github/workflows/deploy.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 103b68a..8689a5d 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -17,8 +17,8 @@ jobs:
 
     - uses: 'google-github-actions/auth@v2'
       with:
-        project_id: '${{ env.GCP_PROJECT_ID }}'
-        workload_identity_provider: 'projects/${{ env.GCP_PROJECT_NUMBER }}/locations/global/workloadIdentityPools/github/providers/github-cwarck-hfe-bot'
+        project_id: '${{ vars.GCP_PROJECT_ID }}'
+        workload_identity_provider: 'projects/${{ vars.GCP_PROJECT_NUMBER }}/locations/global/workloadIdentityPools/github/providers/github-cwarck-hfe-bot'
     
     - name: 'Set up Cloud SDK'
       uses: 'google-github-actions/setup-gcloud@v2'
@@ -27,10 +27,10 @@ jobs:
 
     - name: 'Docker auth'
       run: |-
-        gcloud auth configure-docker ${{ env.GAR_LOCATION }}-docker.pkg.dev
+        gcloud auth configure-docker ${{ vars.GAR_LOCATION }}-docker.pkg.dev
     
     - name: 'Build and push image'
       run: |-
-        IMAGE="${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.GCP_PROJECT_ID }}/hfe-bot:${{ github.sha }}"
+        IMAGE="${{ vars.GAR_LOCATION }}-docker.pkg.dev/${{ vars.GCP_PROJECT_ID }}/hfe-bot:${{ github.sha }}"
         docker build -t $IMAGE .
         docker push $IMAGE

From 32b7e8a453a5da94f5b8f7d8fdab66a1a63ce2cc Mon Sep 17 00:00:00 2001
From: Ilia Akimov <cwarck@gmail.com>
Date: Wed, 14 May 2025 12:43:18 +0200
Subject: [PATCH 3/4] fix image name

---
 .github/workflows/deploy.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 8689a5d..38ec82e 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -31,6 +31,6 @@ jobs:
     
     - name: 'Build and push image'
       run: |-
-        IMAGE="${{ vars.GAR_LOCATION }}-docker.pkg.dev/${{ vars.GCP_PROJECT_ID }}/hfe-bot:${{ github.sha }}"
+        IMAGE="${{ vars.GAR_LOCATION }}-docker.pkg.dev/${{ vars.GCP_PROJECT_ID }}/hfe-bot/hfe-bot:${{ github.sha }}"
         docker build -t $IMAGE .
         docker push $IMAGE

From 6ef184b31904077a51944fc145fb01bb539430ca Mon Sep 17 00:00:00 2001
From: Ilia Akimov <cwarck@gmail.com>
Date: Wed, 14 May 2025 12:45:33 +0200
Subject: [PATCH 4/4] Build image only on push to main

---
 .github/workflows/deploy.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 38ec82e..93e58c2 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -2,7 +2,7 @@ name: Deploy
 
 on:
   push:
-    branches: [main, feat-ci-build-push]
+    branches: [main]
 
 jobs:
   build-push: