Commit 7ff86896 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'init' into 'master' 

New template: ORT

See merge request to-be-continuous/ort!2
parents 36e080a0 bae6d0ca

.gitignore

+3 −1
Original line number Diff line number Diff line 
/target/

!.mvn/wrapper/maven-wrapper.jar



### STS ###

.apt_generated

.classpath
@@ -20,4 +23,3 @@ 
/dist/

/nbdist/

/.nb-gradle/
 
.DS_Store

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ include: 
  - project: "to-be-continuous/kicker"

    ref: "master"

    file: "/templates/validation.yml"

  - component: $CI_SERVER_FQDN/to-be-continuous/bash/gitlab-ci-bash@3.5

  - component: $CI_SERVER_FQDN/to-be-continuous/bash/gitlab-ci-bash@3.6

    inputs:

      shellcheck-files: "*.sh"

  - component: $CI_SERVER_FQDN/to-be-continuous/semantic-release/gitlab-ci-semrel@3.11

  - component: $CI_SERVER_FQDN/to-be-continuous/semantic-release/gitlab-ci-semrel@3.12



variables:

  GITLAB_CI_FILES: "templates/gitlab-ci-ort.yml"

.gitlab/merge_request_templates/new_feature.md

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ Closes #999 
## Checklist



* General:

    * [ ] use [rules](https://docs.gitlab.com/ee/ci/yaml/#rules) instead of [only/except](https://docs.gitlab.com/ee/ci/yaml/#onlyexcept-advanced)

    * [ ] optimized [cache](https://docs.gitlab.com/ee/ci/caching/) configuration (wherever applicable)

    * [ ] use [rules](https://docs.gitlab.com/ci/yaml/#rules) instead of [only/except](https://docs.gitlab.com/ci/yaml/#onlyexcept-advanced)

    * [ ] optimized [cache](https://docs.gitlab.com/ci/caching/) configuration (wherever applicable)

* Publicly usable:

    * [ ] untagged runners

    * [ ] no proxy configuration but support `http_proxy`/`https_proxy`/`no_proxy`

.releaserc.yml

+2 −2
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ plugins: [ 
  ]

]

branches:

  - "main"

  - "master"

tagFormat: "${version}"
 
 No newline at end of file

CONTRIBUTING.md

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ To contribute: 


1. Create an issue describing the bug or enhancement you want to propose (select the right issue template).

2. Make sure the issue has been reviewed and agreed.

3. Create a Merge Request, from your **own** fork (see [forking workflow](https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html) documentation).

3. Create a Merge Request, from your **own** fork (see [forking workflow](https://docs.gitlab.com/user/project/repository/forking_workflow/) documentation).

   Don't hesitate to mark your MR as `Draft` as long as you think it's not ready to be reviewed.



### Git Commit Conventions