Fix workflow

This commit is contained in:
Marcel Otte 2020-04-14 11:53:28 +02:00
parent bf176adb88
commit b2bf61913f
1 changed files with 4 additions and 6 deletions

View File

@ -14,7 +14,6 @@ on:
pull_request: pull_request:
env: env:
# TODO: Change variable to your image's name.
IMAGE_NAME: terasology IMAGE_NAME: terasology
jobs: jobs:
@ -56,7 +55,7 @@ jobs:
- name: Push image - name: Push image
run: | run: |
IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/$IMAGE_NAME IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/$IMAGE_NAME
# Change all uppercase to lowercase # Change all uppercase to lowercase
IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
@ -71,16 +70,15 @@ jobs:
echo IMAGE_ID=$IMAGE_ID echo IMAGE_ID=$IMAGE_ID
echo VERSION=$VERSION echo VERSION=$VERSION
rm versionInfo.properties* || true rm versionInfo.properties* || true
if [ " ${TERASOLOGY_PROPERTIES_URL}" == " " ]; then if [ " ${TERASOLOGY_PROPERTIES_URL}" == " " ]; then
if [ " ${TERASOLOGY_BUILD}" == " " ]; then if [ " ${TERASOLOGY_BUILD}" == " " ]; then
source .env TERASOLOGY_PROPERTIES_URL=http://jenkins.terasology.org/job/TerasologyStable/lastSuccessfulBuild/artifact/build/resources/main/org/terasology/version/versionInfo.properties
TERASOLOGY_PROPERTIES_URL=http://jenkins.terasology.org/job/TerasologyStable/lastSuccessfulBuild/artifact/build/resources/main/org/terasology/version/versionInfo.properties
else else
if [ " ${TERASOLOGY_BUILD}" == " unstable" ]; then if [ " ${TERASOLOGY_BUILD}" == " unstable" ]; then
TERASOLOGY_PROPERTIES_URL=http://jenkins.terasology.org/job/Terasology/lastSuccessfulBuild/artifact/build/resources/main/org/terasology/version/versionInfo.properties TERASOLOGY_PROPERTIES_URL=http://jenkins.terasology.org/job/Terasology/lastSuccessfulBuild/artifact/build/resources/main/org/terasology/version/versionInfo.properties
fi fi
fi fi
fi fi