Skip to content

Commit e251f6e

Browse files
author
Danil Klimuk
committed
WIP
Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>
1 parent cc49b49 commit e251f6e

1 file changed

Lines changed: 11 additions & 4 deletions

File tree

.github/workflows/qubes-dom0-packagev2.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ on:
2323
Forced version of a package.
2424
required: false
2525
type: string
26+
qubes-component-branch:
27+
required: false
28+
type: string
2629

2730
jobs:
2831
build-and-package:
@@ -81,18 +84,22 @@ jobs:
8184
PKG_VER: ${{ inputs.qubes-pkg-version }}
8285
# Following 2 variables are used in double expansion '${${{ github.ref_type }}}',
8386
# do not change these names even though they don't follow the convention.
87+
branch_strict: ${{ inputs.qubes-component-branch }}
8488
branch: ${{ github.head_ref }}
8589
tag: ${{ github.ref_name }}
8690
run: |
8791
cp example-configs/qubes-os-r4.2.yml builder.yml
8892
# Switch from Qubes to Docker executor
8993
sed -i "/^executor:$/,+4d; /^#executor:$/,+3s/#//" builder.yml
9094
91-
branch_name=${${{ github.ref_type }}}
95+
branch_name="${branch_strict}"
9296
if [ -z "$branch_name" ]; then
93-
# github.head_ref is set only for pull requests, this should
94-
# handle pushes
95-
branch_name=$(basename "$GITHUB_REF")
97+
branch_name=${${{ github.ref_type }}}
98+
if [ -z "$branch_name" ]; then
99+
# github.head_ref is set only for pull requests, this should
100+
# handle pushes
101+
branch_name=$(basename "$GITHUB_REF")
102+
fi
96103
fi
97104
98105
if [ -n "$PKG_DIR" ]; then

0 commit comments

Comments
 (0)