From 65bfe690151d708974c741ab9eb929892a804aaa Mon Sep 17 00:00:00 2001 From: BARICHELLO Date: Wed, 31 Oct 2018 00:57:38 -0300 Subject: [PATCH] Reordered checkout in gitlab-ci script Reordered checkout so it doesnt error out on overwriting untracked files. --- .gitlab-ci.yml | 3 +-- README.md | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 20d666f..dd1aa17 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,12 +65,11 @@ deploy-github-pages: - web script: - cd ../ + - git checkout gh-pages - mv game/build/web/** . - - rm README.md - git config user.email artur@barichello.me - git config user.name abarichello - git remote add github $REMOTE_URL - - git checkout gh-pages - git add -A - 'git commit -m "Auto: Deploy GitHub Page $EXPORT_NAME-$CI_JOB_NAME$" -m "Deploy from GitLab pipeline \#$CI_PIPELINE_ID"' - git push github gh-pages -f diff --git a/README.md b/README.md index 6224886..4930aad 100644 --- a/README.md +++ b/README.md @@ -12,5 +12,5 @@ After adapting the paths and names according to your project needs you will need |-|-|-| |$REMOTE_URL | The `git remote` where the web export will be hosted (in this case GitHub), it should contain your [deploy/personal access token](https://github.com/settings/tokens)|`https://:@github.com//.git` -Others variables are set automatically by the `gitlab-runner` +Others variables are set automatically by the `gitlab-runner`
The included `gitlab-ci.yml` is set to only run the export jobs when you commit a new `git tag`, i suggest not using "." or "," in your tag's name since it messes with Godot's export system and will lead to failed jobs.