Skip to content

Commit d627687

Browse files
authored
Update Dev branch with respin and NODE_RED_VERSION (#377)
* Update ssh key fingerprints * really fix ssh keys * Bump versions to 3.1.0-beta.3 * Fix NODE_RED_VERSION and allow for RESPIN
1 parent f63a88d commit d627687

File tree

1 file changed

+33
-4
lines changed

1 file changed

+33
-4
lines changed

.github/workflows/main.yml

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ name: Docker Build
44

55
# Controls when the action will run.
66
on:
7+
workflow_dispatch:
8+
inputs:
9+
version:
10+
required: true
11+
type: string
12+
description: "Version"
713
release:
814
types: [published]
915

@@ -66,6 +72,24 @@ jobs:
6672
fi
6773
done <<< "${{ steps.meta.outputs.tags }}"
6874
75+
echo "Start Tags = $TAGS"
76+
echo "GITHUB_REF = $GITHUB_REF"
77+
78+
echo "version = ${{ github.event.inputs.version }}"
79+
80+
if [[ ! -z "${{ github.event.inputs.version }}" ]]; then
81+
TEMP=${{ github.event.inputs.version }}
82+
TEMP=${TEMP:1}
83+
TEMP2=$(echo $GITHUB_REF | awk -F '/' '{ print $3}')
84+
echo "$GITHUB_REF - $TEMP"
85+
TAGS=$(echo $TAGS | sed "s/$TEMP2/$TEMP/")
86+
TRAVIS_TAG=${{ github.event.inputs.version }}
87+
else
88+
TRAVIS_TAG=$(echo $GITHUB_REF | awk -F '/' '{ print $3}')
89+
fi
90+
91+
echo "TRAVIS_TAG = $TRAVIS_TAG"
92+
6993
TRAVIS_TAG=$(echo $GITHUB_REF | awk -F '/' '{ print $3}')
7094
if [[ "$TRAVIS_TAG" =~ ^v[0-9\.-]*$ ]]; then
7195
IMAGE=${{ env.DEFAULT_IMAGE }}
@@ -99,14 +123,14 @@ jobs:
99123
100124
echo "tags=$TAGS" >> $GITHUB_OUTPUT
101125
echo "push=$PUSH" >> $GITHUB_OUTPUT
102-
echo "version=$(echo $GITHUB_REF | awk -F '/' '{ print $3}')" >> $GITHUB_OUTPUT
126+
echo "version=$TRAVIS_TAG" >> $GITHUB_OUTPUT
103127
echo "buildVersion=$VERSION" >> $GITHUB_OUTPUT
104128
105129
cat $GITHUB_OUTPUT
106130
107131
# echo "::set-output name=tags::$TAGS"
108132
# echo "::set-output name=push::$PUSH"
109-
# echo "::set-output name=version::$(echo $GITHUB_REF | awk -F '/' '{ print $3}')"
133+
# echo "::set-output name=version::$TRAVIS_TAG"
110134
# echo "::set-output name=buildVersion::$VERSION"
111135
-
112136
name: Login to DockerHub
@@ -176,7 +200,12 @@ jobs:
176200
177201
echo Original tags ${{ steps.meta.outputs.tags }}
178202
179-
TRAVIS_TAG=$(echo $GITHUB_REF | awk -F '/' '{ print $3}')
203+
if [[ ! -z "${{ github.event.inputs.version }}" ]]; then
204+
TRAVIS_TAG=${{ github.event.inputs.version }}
205+
else
206+
TRAVIS_TAG=$(echo $GITHUB_REF | awk -F '/' '{ print $3}')
207+
fi
208+
180209
if [[ "$TRAVIS_TAG" =~ ^v[0-9\.-]*$ ]]; then
181210
# release build
182211
IMAGE=${{ env.DEFAULT_IMAGE }}
@@ -203,7 +232,7 @@ jobs:
203232
echo $TAGS
204233
echo "tags=$TAGS" >> $GITHUB_OUTPUT
205234
echo "push=$PUSH" >> $GITHUB_OUTPUT
206-
echo "version=$(echo $GITHUB_REF | awk -F '/' '{ print $3}')" >> $GITHUB_OUTPUT
235+
echo "version=$TRAVIS_TAG" >> $GITHUB_OUTPUT
207236
echo "buildVersion=$VERSION" >> $GITHUB_OUTPUT
208237
209238
cat $GITHUB_OUTPUT

0 commit comments

Comments
 (0)