Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve CI and drop Taiga 3 #36

Merged
merged 13 commits into from
May 17, 2020
22 changes: 13 additions & 9 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---

name: Bug report
about: Create a report to help us improve
title: ''
Expand Down Expand Up @@ -26,19 +27,22 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**Docker (please complete the following information):**
- Docker / Docker-compose Version: [e.g. Docker version 18.03.0-ce, build 0520e24]
- Image [e.g. docker-taiga-front:4.2-alpine]

- Docker / Docker-compose Version: (e.g. Docker version 18.03.0-ce, build 0520e24)
- Image (e.g. docker-taiga-front:4.2-alpine)

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

- OS: (e.g. iOS)
- Browser (e.g. chrome, safari)
- Version (e.g. 22)

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

- Device: (e.g. iPhone6)
- OS: (e.g. iOS8.1)
- Browser (e.g. stock browser, safari)
- Version (e.g. 22)

**Additional context**
Add any other context about the problem here.
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---

name: Feature request
about: Suggest an idea for this project
title: ''
Expand All @@ -8,7 +9,7 @@ assignees: madmath03
---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
A clear and concise description of what the problem is. Ex. I'm always frustrated when (...)

**Describe the solution you'd like**
A clear and concise description of what you want to happen.
Expand Down
29 changes: 29 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<!--

Some key notes before you open a PR:

1. Select which branch should this PR be merged in? By default, you should always merge to the develop branch.
2. PR name follows [convention](http://karma-runner.github.io/4.0/dev/git-commit-msg.html)
3. All tests pass locally, UI and Unit tests
4. All business logic and validations must be on the server-side
5. Update necessary Documentation
6. Put `closes #XXXX` in your comment to auto-close the issue that your PR fixes


Also, if you're new here

- Contribution Guide => https://github.com/Monogramm/docker-taiga/blob/master/CONTRIBUTING.md

-->

> Please provide enough information so that others can review your pull request:

<!-- You can skip this if you're fixing a typo or updating existing documentation -->

> Explain the **details** for making this change. What existing problem does the pull request solve?

<!-- Example: When "Adding a function to do X", explain why it is necessary to have a way to do X. -->

> Screenshots/GIFs

<!-- Add images/recordings to better visualize the change: expected/current behviour -->
31 changes: 31 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
**/.vscode
.idea/
*.iml
.kdev4/
*.kdev4

*.DS_Store
Thumbs.db

# eclipse
.project
.classpath
.settings

#netbeans specific
#core
nbproject/*
!nbproject/project.properties
!nbproject/project.xml

#java specific
*.class

#general swap/backup files
*.so
*.log
*.out
*~
*.swp
*.DS_Store
*.lock
30 changes: 17 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,30 @@
os: linux
dist: trusty
sudo: required

services: docker

language: bash
language: shell

branches:
only:
- master
- develop

before_script:
before_install:
- env | sort
- dir="images/${VERSION}/${VARIANT}"
- home="$(pwd)"
- travis_dir="${home}/images/${VERSION}/${VARIANT}"

script:
- cd "$dir"
install:
- cd "$travis_dir"
# Test containers build
- travis_retry docker-compose build

before_script:
- docker images

script:
- cd "$travis_dir"
# Test containers run
- docker-compose up -d && sleep 60
- docker-compose ps
Expand All @@ -27,10 +34,10 @@ script:
- docker-compose logs "taiga_front"
- docker-compose ps "taiga_front" | grep "Up"
# TODO Test Front custom setup properly applied
#- curl http://localhost/config.json
#- curl http://localhost/config.json | grep 'gitlab-auth.json'
#- curl http://localhost/config.json | grep 'github-auth.json'
#- curl http://localhost/config.json | grep '"ldap"'
#- curl http://localhost:80/config.json
#- curl http://localhost:80/config.json | grep 'gitlab-auth.json'
#- curl http://localhost:80/config.json | grep 'github-auth.json'
#- curl http://localhost:80/config.json | grep '"ldap"'
# Test containers can be dropped and restarted
- docker-compose down
- docker-compose up -d && sleep 60
Expand All @@ -42,15 +49,12 @@ script:
- docker-compose ps "taiga_front" | grep "Up"

after_script:
- docker images
- docker ps -a

notifications:
email: false

env: # Environments
- VERSION=3.3 VARIANT=alpine
- VERSION=3.4 VARIANT=alpine
- VERSION=4.0 VARIANT=alpine
- VERSION=4.1 VARIANT=alpine
- VERSION=4.2 VARIANT=alpine
Expand Down
3 changes: 1 addition & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Contributing
============
# Contributing

First of all, **thank you** for contributing, **you are awesome**!

Expand Down
Loading