From 0007b6da732e2428330c54a6c62d2b9f754b784f Mon Sep 17 00:00:00 2001 From: blockchainluffy Date: Fri, 6 Dec 2024 11:53:52 +0530 Subject: [PATCH 1/6] fix/staging deployment --- .github/workflows/deploy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 576fea0..227f633 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -35,7 +35,6 @@ jobs: # Branch Name Validation for Pull Requests validate_branch_name: - if: github.event_name == 'pull_request' runs-on: ubuntu-latest steps: - name: Validate branch name From 676fd6053746081d0d37a9d5128a47fd928419bf Mon Sep 17 00:00:00 2001 From: faheelsattar Date: Fri, 6 Dec 2024 12:58:39 +0500 Subject: [PATCH 2/6] upd observer --- observer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observer b/observer index d2fec5e..9093d11 160000 --- a/observer +++ b/observer @@ -1 +1 @@ -Subproject commit d2fec5eb25bfaafd5eb193fe9ea4075d18831e7e +Subproject commit 9093d11be801d9f3043e06158132463d47f70887 From cbb5b9bb08cdeec47f7c122a1847f0e6d286c356 Mon Sep 17 00:00:00 2001 From: blockchainluffy Date: Fri, 6 Dec 2024 14:24:59 +0530 Subject: [PATCH 3/6] validate workflow to use ref_name --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 227f633..23338e1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -39,7 +39,7 @@ jobs: steps: - name: Validate branch name run: | - BRANCH_NAME="${{ github.head_ref }}" + BRANCH_NAME="${{ github.ref_name }}" echo "Validating branch name: $BRANCH_NAME" # Allow 'staging' and 'main' branches From 2d61737bc63e610ee19ec134567deb99425221bb Mon Sep 17 00:00:00 2001 From: blockchainluffy Date: Fri, 6 Dec 2024 14:38:45 +0530 Subject: [PATCH 4/6] workflow:added separate branch name getting for PR and pushes --- .github/workflows/deploy.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 23338e1..d9f02dc 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -39,7 +39,11 @@ jobs: steps: - name: Validate branch name run: | - BRANCH_NAME="${{ github.ref_name }}" + if [ "${{ github.event_name }}" == "pull_request" ]; then + $BRANCH_NAME=${{ github.head_ref }} + else + $BRANCH_NAME=${{ github.ref_name }} + fi echo "Validating branch name: $BRANCH_NAME" # Allow 'staging' and 'main' branches From 621ef5066a8563d1e6988cf5ca362fc330df15e0 Mon Sep 17 00:00:00 2001 From: blockchainluffy Date: Fri, 6 Dec 2024 14:40:27 +0530 Subject: [PATCH 5/6] workflow:added separate branch name getting for PR and pushes --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d9f02dc..c959046 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -39,6 +39,7 @@ jobs: steps: - name: Validate branch name run: | + $BRANCH_NAME="" if [ "${{ github.event_name }}" == "pull_request" ]; then $BRANCH_NAME=${{ github.head_ref }} else From 5372cbec88032e4619c0c1906d31d281de9c455e Mon Sep 17 00:00:00 2001 From: blockchainluffy Date: Fri, 6 Dec 2024 14:41:44 +0530 Subject: [PATCH 6/6] workflow:added separate branch name getting for PR and pushes --- .github/workflows/deploy.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c959046..726d7e1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -39,11 +39,10 @@ jobs: steps: - name: Validate branch name run: | - $BRANCH_NAME="" if [ "${{ github.event_name }}" == "pull_request" ]; then - $BRANCH_NAME=${{ github.head_ref }} + BRANCH_NAME=${{ github.head_ref }} else - $BRANCH_NAME=${{ github.ref_name }} + BRANCH_NAME=${{ github.ref_name }} fi echo "Validating branch name: $BRANCH_NAME"