Skip to content
Snippets Groups Projects
Commit 4d5596d4 authored by Damien Pollet's avatar Damien Pollet :coffee:
Browse files

Deal with recentbashisms

parent de6c2a0a
No related branches found
No related tags found
No related merge requests found
...@@ -7,10 +7,8 @@ default: ...@@ -7,10 +7,8 @@ default:
build: build:
script: script:
- apk --no-cache add make git - apk --no-cache add make git
- pandoc --version - sh --version; git --version; pandoc --version
- git --version - git branch --verbose; git branch --verbose --remote
- git branch --verbose
- git branch --verbose --remote
- make prepare wipe - make prepare wipe
- make - make
- make publish - make publish
...@@ -16,10 +16,10 @@ all : $(OUT_MARKUP) $(OUT_OTHERS) ...@@ -16,10 +16,10 @@ all : $(OUT_MARKUP) $(OUT_OTHERS)
prepare : $(OUT) prepare : $(OUT)
git fetch origin public git fetch origin public
git worktree add $(OUT) public git worktree add $(OUT) public
if [[ -v DEPLOY_TOKEN ]]; then \ if [ -n "$${DEPLOY_TOKEN}" ]; then \
git config user.name "$GITLAB_USER_NAME"; \ git config user.name '${GITLAB_USER_NAME}'; \
git config user.email "$GITLAB_USER_EMAIL"; \ git config user.email '${GITLAB_USER_EMAIL}'; \
git remote set-url origin "https://cicd:${DEPLOY_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git"; \ git remote set-url origin "https://cicd:$${DEPLOY_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git"; \
fi fi
wipe : wipe :
...@@ -28,7 +28,7 @@ wipe : ...@@ -28,7 +28,7 @@ wipe :
publish : publish :
git -C $(OUT) add . git -C $(OUT) add .
git -C $(OUT) commit --message 'Publish from $(shell git rev-parse HEAD)' git -C $(OUT) commit --message 'Publish from $(shell git rev-parse HEAD)'
git -C $(OUT) push --push-option ci.skip origin HEAD:public git -C $(OUT) push --push-option ci.skip origin 'HEAD:public'
clean : clean :
rm -fr $(OUT) rm -fr $(OUT)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment