Skip to content

Commit 319010b

Browse files
authored
chore(e2e): support building from multiple branches and a workflow trigger override; also use push, not PR - rhidp-6351 (#2544)
Signed-off-by: Nick Boldt <[email protected]>
1 parent da3b2f2 commit 319010b

File tree

1 file changed

+24
-2
lines changed

1 file changed

+24
-2
lines changed

.github/workflows/push-e2e-runner.yaml

+24-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
name: Build & Push e2e-runner Image to Quay.io
22

33
on:
4-
pull_request:
4+
push:
55
branches:
66
- main
7+
- release-1.[0-9]+
78
paths:
89
- '.ibm/images/Dockerfile'
910
- '.yarnrc.yml'
11+
workflow_dispatch:
12+
inputs:
13+
branch:
14+
description: Target branch to build
15+
required: true
16+
default: 'NONE'
1017

1118
concurrency:
1219
group: ${{ github.workflow }}-${{ github.ref }}
@@ -15,7 +22,6 @@ concurrency:
1522
env:
1623
REGISTRY: quay.io
1724
REGISTRY_IMAGE: rhdh-community/rhdh-e2e-runner
18-
IMAGE_TAG: main
1925

2026
jobs:
2127
build-image:
@@ -38,6 +44,21 @@ jobs:
3844
- name: Prepare Environment Variables
3945
run: |
4046
echo "PLATFORM=linux/amd64" >> $GITHUB_ENV
47+
latestNext="next"
48+
# for main branch, use next tags; for 1.y branches, use :latest tags
49+
if [[ $(git rev-parse --abbrev-ref HEAD) != "main" ]]; then
50+
latestNext="latest"
51+
fi
52+
echo "LATESTNEXT=${latestNext}" >> $GITHUB_ENV
53+
54+
# create image tag from the correct branch (either from a push or a workflow_dispatch trigger)
55+
if [[ "${{ inputs.branch }}" != "NONE" ]]; then
56+
git checkout "${{ inputs.branch }}"
57+
IMAGE_TAG="${{ inputs.branch }}"
58+
else
59+
IMAGE_TAG=$(git rev-parse --abbrev-ref HEAD)
60+
fi
61+
echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
4162
4263
- name: Set up Docker Buildx
4364
uses: docker/setup-buildx-action@v3
@@ -58,4 +79,5 @@ jobs:
5879
tags: |
5980
${{ env.REGISTRY }}/${{ env.REGISTRY_IMAGE }}:${{ env.IMAGE_TAG }}
6081
${{ env.REGISTRY }}/${{ env.REGISTRY_IMAGE }}:${{ env.IMAGE_TAG }}-${{ env.SHORT_SHA }}
82+
${{ env.REGISTRY }}/${{ env.REGISTRY_IMAGE }}:${{ env.LATESTNEXT }}
6183
platforms: ${{ env.PLATFORM }}

0 commit comments

Comments
 (0)