From 73638676cdb05c87cc55e76a2b53b45d91b708a4 Mon Sep 17 00:00:00 2001
From: gatici <gulsum.atici@canonical.com>
Date: Wed, 18 Dec 2024 15:32:28 +0300
Subject: [PATCH] chore: update GHA to run workflows for rel-1.5

Signed-off-by: gatici <gulsum.atici@canonical.com>
---
 .github/workflows/main.yml |  4 ++--
 .github/workflows/push.yml | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5ec108b..88e5ea1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -7,10 +7,10 @@ name: Main workflow
 on:
   pull_request:
     branches:
-      - main
+      - rel-*
   push:
     branches:
-      - main
+      - rel-*
 
 jobs:
   build:
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 18ccc1f..b3e5388 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -5,7 +5,7 @@ name: GitHub release and Docker images
 on:
   push:
     branches:
-      - main
+      - rel-*
     tags:
       - v*
 
@@ -32,16 +32,16 @@ jobs:
           username: ${{ secrets.AETHER_REGISTRY_USERNAME }}
           password: ${{ secrets.AETHER_REGISTRY_PASSWORD }}
 
-      - name: Build and push "master-latest" Docker image
+      - name: Build and push "${{ github.ref_name }}-latest" Docker image
         env:
-          DOCKER_TAG: master-latest
+          DOCKER_TAG: ${{ github.ref_name }}-latest
         run: |
           make docker-build
           make docker-push
 
-      - name: Build and push "master-GIT_SHA" Docker image
+      - name: Build and push "${{ github.ref_name }}-GIT_SHA" Docker image
         env:
-          DOCKER_TAG: master-${{ env.GIT_SHA_SHORT }}
+          DOCKER_TAG: ${{ github.ref_name }}-${{ env.GIT_SHA_SHORT }}
         run: |
           make docker-build
           make docker-push
@@ -110,7 +110,7 @@ jobs:
             https://api.github.com/repos/${{ github.repository }}/releases \
             -d '{
               "tag_name": "v${{ steps.version-change.outputs.version }}",
-              "target_commitish": "${{ github.event.repository.default_branch }}",
+              "target_commitish": "${{ github.ref_name }}",
               "name": "v${{ steps.version-change.outputs.version }}",
               "draft": false,
               "prerelease": false,
@@ -164,12 +164,13 @@ jobs:
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v7
         with:
+          base: ${{ github.ref_name }}
           token: ${{ secrets.GH_OMEC_PAT }}
           commit-message: Update version
           committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
           author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com>
           signoff: true
-          branch: version-update
+          branch: "chore/version-update"
           delete-branch: true
           title: Update version
           body: |