GHA add branch name

signadot · Nov 7, 2023 · 99826bf · 99826bf
1 parent 5ed51ac
commit 99826bf
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -131,7 +131,8 @@ jobs:
             /signadot sandbox apply \
             --set github-pr=${{ github.event.number }} \
             --set image=signadot/hotrod:${IMAGE_TAG} \
-            --set git-branch=pr-${{ github.event.number }}-route \
+            --set branch=${{ github.ref_name }} \
+            --set name=pr-${{ github.event.number }}-route \
             -f - \
             -o yaml \
             < ${GITHUB_WORKSPACE}/.signadot/route-template.yaml \
@@ -188,7 +189,8 @@ jobs:
             /signadot sandbox apply \
             --set github-pr=${{ github.event.number }} \
             --set image=signadot/hotrod:${IMAGE_TAG} \
-            --set git-branch=pr-${{ github.event.number }}-frontend \
+            --set branch=${{ github.ref_name }} \
+            --set name=pr-${{ github.event.number }}-frontend \
             -f - \
             -o yaml \
             < ${GITHUB_WORKSPACE}/.signadot/frontend-template.yaml \
@@ -224,7 +226,8 @@ jobs:
             /signadot sandbox apply \
             --set github-pr=${{ github.event.number }} \
             --set image=signadot/hotrod:${IMAGE_TAG} \
-            --set git-branch=pr-${{ github.event.number }}-customer \
+            --set branch=${{ github.ref_name }} \
+            --set name=pr-${{ github.event.number }}-customer \
             -f - \
             -o yaml \
             < ${GITHUB_WORKSPACE}/.signadot/customer-template.yaml \
@@ -259,7 +262,8 @@ jobs:
             /signadot sandbox apply \
             --set github-pr=${{ github.event.number }} \
             --set image=signadot/hotrod:${IMAGE_TAG} \
-            --set git-branch=pr-${{ github.event.number }}-driver \
+            --set branch=${{ github.ref_name }} \
+            --set name=pr-${{ github.event.number }}-driver \
             -f - \
             -o yaml \
             < ${GITHUB_WORKSPACE}/.signadot/driver-template.yaml \

diff --git a/.signadot/customer-template.yaml b/.signadot/customer-template.yaml
@@ -1,10 +1,11 @@
-name: "@{git-branch}"
+name: "@{name}"
 spec:
   description: sandbox for customer service
   cluster: demo
   labels:
     signadot/github-repo: "signadot/hotrod"
     signadot/github-pull-request: "@{github-pr}"
+    branch: "@{branch}"
   forks:
   - forkOf:
       kind: Deployment

diff --git a/.signadot/driver-template.yaml b/.signadot/driver-template.yaml
@@ -1,10 +1,11 @@
-name: "@{git-branch}"
+name: "@{name}"
 spec:
   description: sandbox for driver service
   cluster: demo
   labels:
     signadot/github-repo: "signadot/hotrod"
     signadot/github-pull-request: "@{github-pr}"
+    branch: "@{branch}"
   forks:
   - forkOf:
       kind: Deployment

diff --git a/.signadot/frontend-template.yaml b/.signadot/frontend-template.yaml
@@ -1,10 +1,11 @@
-name: "@{git-branch}"
+name: "@{name}"
 spec:
   description: sandbox for frontend service
   cluster: demo
   labels:
     signadot/github-repo: "signadot/hotrod"
     signadot/github-pull-request: "@{github-pr}"
+    branch: "@{branch}"
   forks:
   - forkOf:
       kind: Deployment

diff --git a/.signadot/route-template.yaml b/.signadot/route-template.yaml
@@ -1,10 +1,11 @@
-name: "@{git-branch}"
+name: "@{name}"
 spec:
   description: sandbox for route service
   cluster: demo
   labels:
     signadot/github-repo: "signadot/hotrod"
     signadot/github-pull-request: "@{github-pr}"
+    branch: "@{branch}"
   forks:
   - forkOf:
       kind: Deployment