Merge branch 'feature/add-bedroom-to-screen1' of https://git.teletype.hu/games/impostor into feature/add-bedroom-to-screen1
This commit is contained in:
3
Makefile
3
Makefile
@@ -95,8 +95,9 @@ clean:
|
|||||||
|
|
||||||
# CI/CD Targets
|
# CI/CD Targets
|
||||||
ci-version:
|
ci-version:
|
||||||
@VERSION=$$(sed -n "s/^-- version: //p" inc/meta/meta.header.lua | head -n 1 | tr -d "[:space:]"); \
|
@VERSION=$$(sed -n "s/^-- version: //p" inc-meta-meta.header.lua | head -n 1 | tr -d "[:space:]"); \
|
||||||
BRANCH=$${CI_COMMIT_BRANCH:-$${WOODPECKER_BRANCH}}; \
|
BRANCH=$${CI_COMMIT_BRANCH:-$${WOODPECKER_BRANCH}}; \
|
||||||
|
BRANCH=$$(echo "$$BRANCH" | tr '/' '-'); \
|
||||||
if [ "$$BRANCH" != "main" ] && [ "$$BRANCH" != "master" ] && [ -n "$$BRANCH" ]; then \
|
if [ "$$BRANCH" != "main" ] && [ "$$BRANCH" != "master" ] && [ -n "$$BRANCH" ]; then \
|
||||||
VERSION=dev-$$VERSION-$$BRANCH; \
|
VERSION=dev-$$VERSION-$$BRANCH; \
|
||||||
fi; \
|
fi; \
|
||||||
|
|||||||
Reference in New Issue
Block a user