Merge branch 'multiarch' into multiarch-latest

# Conflicts:
#	.github/workflows/build-multiarch.yml
This commit is contained in:
Geoff Bourne 2020-11-25 16:09:23 -06:00
commit cb5d052829

View File

@ -22,7 +22,7 @@ jobs:
DOCKER_IMAGE=itzg/minecraft-server
VERSION=edge
if [[ $GITHUB_REF == refs/tags/* ]]; then
VERSION=${GITHUB_REF#refs/tags/v}
VERSION=${GITHUB_REF#refs/tags/}
fi
if [[ $GITHUB_REF == refs/heads/* ]]; then
VERSION=${GITHUB_REF#refs/heads/}