Skip to content

Commit

Permalink
Merge pull request #335 from fga-gpp-mds/hotfix/1.0
Browse files Browse the repository at this point in the history
Hotfix/1.0
  • Loading branch information
Geovannioj authored May 27, 2018
2 parents 7384c64 + d868326 commit 0241d0d
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 17 deletions.
29 changes: 14 additions & 15 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,20 @@ build:
only:
- tags
- dev
# - master

# Build of GitHub Pages
pages:
stage: build
before_script:
- git config user.email "<[email protected]>"
- git config --global user.name "Baldissera"
script:
- mkdocs build
- git add site/
- git commit -m"Build new Pages with $CI_PIPELINE_ID"
- git push https://$GITHUB_USERNAME:[email protected]/fga-gpp-mds/2018.1_Nexte.git `git subtree split --prefix site/`:gh-pages --force
only:
- dev

# Deploy to PlayStore in Beta Version
deploy_beta:
Expand All @@ -82,20 +95,6 @@ deploy_beta:
only:
- tags

# Build of GitHub Pages
pages:
stage: build
before_script:
- git config user.email "<[email protected]>"
- git config --global user.name "Baldissera"
script:
- mkdocs build
- git add site/
- git commit -m"Build new Pages with $CI_PIPELINE_ID"
- git push https://$GITHUB_USERNAME:[email protected]/fga-gpp-mds/2018.1_Nexte.git `git subtree split --prefix site/`:gh-pages --force
only:
- dev

# Cache for use on next executions
cache:
key: ${CI_PROJECT_ID}2
Expand Down
4 changes: 2 additions & 2 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ pages:
- Resultados: Sprints/Sprint8/Sprint8-Resultados.md
- Sprint 9:
- Planejamento: Sprints/Sprint9/Sprint9-Planejamento.md
- Resultados: Sprint/Sprint9/Sprint9-Resultados.md
- Resultados: Sprints/Sprint9/Sprint9-Resultados.md
- Sprint 10:
- Planejamento: Sprints/Sprint10/Sprint10-Planejamento.md
- Resultados: Sprints/Sprint10/Sprint10-Resultados.md
- Sprint11:
- Planejamento: Sprints/Sprint11/Sprint11-Planejmento.md
- Planejamento: Sprints/Sprint11/Sprint11-Planejamento.md
- Post Mortem:
- Post Mortem - Release 1: PostMortem/PostMortemRelease1.md

0 comments on commit 0241d0d

Please sign in to comment.