From 3c64d76d868bd712697d4ed42eee4e2a32848590 Mon Sep 17 00:00:00 2001
From: Sietse Snel <s.t.snel@uu.nl>
Date: Thu, 29 Feb 2024 14:32:49 +0100
Subject: [PATCH] CI: update image build logic

- Change development image tag to "development" so that branch name and tag name are the same
  (and we don't need any logic to translate between branch names and tag names)
- Also build images for release-1.9 branch
---
 .github/workflows/build-push-image.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-push-image.yml b/.github/workflows/build-push-image.yml
index cbb4e71..4b73359 100644
--- a/.github/workflows/build-push-image.yml
+++ b/.github/workflows/build-push-image.yml
@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - 'development'
+      - 'release-1.9'
 
 jobs:
   push-image:
@@ -14,12 +15,17 @@ jobs:
       contents: read
       packages: write
     steps:
+    - name: Extract branch name
+      shell: bash
+      run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+      id: extract_branch
+
     - name: Check out Yoda repository
       uses: actions/checkout@v3
       with:
         path: yoda
         repository: UtrechtUniversity/yoda
-        ref: development
+        ref: ${{ steps.extract_branch.outputs.branch }}
 
     - name: Authenticate to the container registry
       uses: docker/login-action@v2
@@ -39,4 +45,6 @@ jobs:
         context: yoda/docker/images/yoda_public
         file: yoda/docker/images/yoda_public/Dockerfile
         push: true
-        tags: ghcr.io/utrechtuniversity/yoda-public:dev-1.9
+        tags: ghcr.io/utrechtuniversity/yoda-public:${{ steps.extract_branch.outputs.branch }}
+        build-args: |
+          TAG=${{ steps.extract_branch.outputs.branch }}