fix errors in naming

Author: timcadman

.github/workflows/build-env.yml

@@ -3,7 +3,7 @@ name: Build Golden Base Image
 on:
   push:
     branches:
-      - 'chore/improve-ci'
+      - 'v*-dev'
   workflow_dispatch:
     inputs:
       release_tag:
@@ -41,4 +41,4 @@ jobs:
           build-args: |
             DANGER_VERSION=${{ github.event.inputs.danger_version || 'v6.3.4-dev' }}
           tags: |
-            ghcr.io/${{ github.repository_owner }}/ds-base-env:${{ github.event.inputs.release_tag || 'v7.0.0-dev' }}
+            ghcr.io/${{ github.repository_owner }}/ds-base-env:${{ github.event.inputs.release_tag || github.ref_name }}

.github/workflows/dsBaseClient_test_suite.yaml

@@ -27,11 +27,7 @@ jobs:
     # This logic automatically selects the image tag
     container:
       image: >-
-        ghcr.io/${{ github.repository_owner }}/ds-base-env:${{
-          startsWith(github.ref_name, 'dev-') &&
-          replace(github.ref_name, 'dev-', 'v') ||
-          'latest'
-        }}-dev
+        ghcr.io/${{ github.repository_owner }}/ds-base-env:${{ env.IMAGE_TAG }}
       options: --user root -v /var/run/docker.sock:/var/run/docker.sock
 
     env:
@@ -41,6 +37,7 @@ jobs:
       PROJECT_NAME: dsBaseClient
       BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
       REPO_OWNER: ${{ github.repository_owner }}
+      IMAGE_TAG: ${{ github.event.pull_request.base.ref || github.ref_name }}
       R_KEEP_PKG_SOURCE: yes
       GITHUB_TOKEN: ${{ github.token || 'placeholder-token' }}