Skip to content

Commit 4bce2ff

Browse files
robkooperrobkooper
committed
github has new way for env variables
1 parent 9d6e794 commit 4bce2ff

File tree

2 files changed

+48
-28
lines changed

2 files changed

+48
-28
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 36 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,18 @@ jobs:
3333
- uses: actions/checkout@v2
3434
- name: github branch
3535
run: |
36-
BRANCH=${GITHUB_REF##*/}
37-
echo "::set-env name=GITHUB_BRANCH::${BRANCH}"
36+
if [ "${{ github.event.release.target_commitish }}" != "" ]; then
37+
BRANCH="${{ github.event.release.target_commitish }}"
38+
else
39+
BRANCH=${GITHUB_REF##*/}
40+
fi
41+
echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV
3842
if [ "$BRANCH" == "master" ]; then
39-
echo "::set-env name=CLOWDER_VERSION::$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')"
43+
echo "CLOWDER_VERSION=$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" >> $GITHUB_ENV
4044
elif [ "$BRANCH" == "develop" ]; then
41-
echo "::set-env name=CLOWDER_VERSION::develop"
45+
echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV
4246
else
43-
echo "::set-env name=CLOWDER_VERSION::testing"
47+
echo "CLOWDER_VERSION=testing" >> $GITHUB_ENV
4448
fi
4549
- uses: actions/setup-java@v1
4650
with:
@@ -83,14 +87,18 @@ jobs:
8387
- uses: actions/checkout@v2
8488
- name: github branch
8589
run: |
86-
BRANCH=${GITHUB_REF##*/}
87-
echo "::set-env name=GITHUB_BRANCH::${BRANCH}"
90+
if [ "${{ github.event.release.target_commitish }}" != "" ]; then
91+
BRANCH="${{ github.event.release.target_commitish }}"
92+
else
93+
BRANCH=${GITHUB_REF##*/}
94+
fi
95+
echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV
8896
if [ "$BRANCH" == "master" ]; then
89-
echo "::set-env name=CLOWDER_VERSION::$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')"
97+
echo "CLOWDER_VERSION=$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" >> $GITHUB_ENV
9098
elif [ "$BRANCH" == "develop" ]; then
91-
echo "::set-env name=CLOWDER_VERSION::develop"
99+
echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV
92100
else
93-
echo "::set-env name=CLOWDER_VERSION::testing"
101+
echo "CLOWDER_VERSION=testing" >> $GITHUB_ENV
94102
fi
95103
- uses: actions/setup-java@v1
96104
with:
@@ -123,14 +131,18 @@ jobs:
123131
- uses: actions/checkout@v2
124132
- name: github branch
125133
run: |
126-
BRANCH=${GITHUB_REF##*/}
127-
echo "::set-env name=GITHUB_BRANCH::${BRANCH}"
134+
if [ "${{ github.event.release.target_commitish }}" != "" ]; then
135+
BRANCH="${{ github.event.release.target_commitish }}"
136+
else
137+
BRANCH=${GITHUB_REF##*/}
138+
fi
139+
echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV
128140
if [ "$BRANCH" == "master" ]; then
129-
echo "::set-env name=CLOWDER_VERSION::$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')"
141+
echo "CLOWDER_VERSION=$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" >> $GITHUB_ENV
130142
elif [ "$BRANCH" == "develop" ]; then
131-
echo "::set-env name=CLOWDER_VERSION::develop"
143+
echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV
132144
else
133-
echo "::set-env name=CLOWDER_VERSION::testing"
145+
echo "CLOWDER_VERSION=testing" >> $GITHUB_ENV
134146
fi
135147
- uses: actions/setup-java@v1
136148
with:
@@ -185,14 +197,18 @@ jobs:
185197
- uses: actions/checkout@v2
186198
- name: github branch
187199
run: |
188-
BRANCH=${GITHUB_REF##*/}
189-
echo "::set-env name=GITHUB_BRANCH::${BRANCH}"
200+
if [ "${{ github.event.release.target_commitish }}" != "" ]; then
201+
BRANCH="${{ github.event.release.target_commitish }}"
202+
else
203+
BRANCH=${GITHUB_REF##*/}
204+
fi
205+
echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV
190206
if [ "$BRANCH" == "master" ]; then
191-
echo "::set-env name=CLOWDER_VERSION::$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')"
207+
echo "CLOWDER_VERSION=$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" >> $GITHUB_ENV
192208
elif [ "$BRANCH" == "develop" ]; then
193-
echo "::set-env name=CLOWDER_VERSION::develop"
209+
echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV
194210
else
195-
echo "::set-env name=CLOWDER_VERSION::testing"
211+
echo "CLOWDER_VERSION=testing" >> $GITHUB_ENV
196212
fi
197213
- uses: actions/setup-java@v1
198214
with:

‎.github/workflows/docker.yml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,12 @@ jobs:
6565
# calculate some variables that are used later
6666
- name: github branch
6767
run: |
68-
BRANCH=${GITHUB_REF##*/}
69-
echo "::set-env name=GITHUB_BRANCH::${BRANCH}"
68+
if [ "${{ github.event.release.target_commitish }}" != "" ]; then
69+
BRANCH="${{ github.event.release.target_commitish }}"
70+
else
71+
BRANCH=${GITHUB_REF##*/}
72+
fi
73+
echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV
7074
if [ "$BRANCH" == "master" ]; then
7175
version="$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')"
7276
tags="latest"
@@ -76,14 +80,14 @@ jobs:
7680
tags="${tags},${version}"
7781
version=${version%.*}
7882
done
79-
echo "::set-env name=CLOWDER_VERSION::$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')"
80-
echo "::set-env name=CLOWDER_TAGS::${tags}"
83+
echo "CLOWDER_VERSION=$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" >> $GITHUB_ENV
84+
echo "CLOWDER_TAGS=${tags}" >> $GITHUB_ENV
8185
elif [ "$BRANCH" == "develop" ]; then
82-
echo "::set-env name=CLOWDER_VERSION::develop"
83-
echo "::set-env name=CLOWDER_TAGS::develop"
86+
echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV
87+
echo "CLOWDER_TAGS=develop" >> $GITHUB_ENV
8488
else
85-
echo "::set-env name=CLOWDER_VERSION::testing"
86-
echo "::set-env name=CLOWDER_TAGS::"
89+
echo "CLOWDER_VERSION=testing" >> $GITHUB_ENV
90+
echo "CLOWDER_TAGS=" >> $GITHUB_ENV
8791
fi
8892
8993
# build the docker image, this will always run to make sure

0 commit comments

Comments
 (0)