Skip to content
Snippets Groups Projects
Commit caaaeb66 authored by jfriedli's avatar jfriedli
Browse files

move from master to main

parent d11a87d5
Branches main
Tags v1.8.6
1 merge request!1285v1.8.6
Pipeline #297498 passed
......@@ -64,7 +64,7 @@ build_frontend_with_placeholder_url:
variables:
MAT2_API_URL_PROD: '$MAT_API_HOST_PLACEHOLDER'
only:
- master
- main
- develop
- schedules
- tags
......@@ -96,7 +96,7 @@ build_frontend_with_placeholder_url:
build_container:
<<: *container-build-template
only:
- master
- main
- develop
build_tagged_container:
......
......@@ -36,7 +36,7 @@ The following variables are **optional** and must match the API configuration.
**Registry Backend:** https://0xacab.org/jvoisin/mat2-web/container_registry
You can find the config env variables above.
A minimal example taken from a [docker-compose.yml](https://0xacab.org/jfriedli/mat2-web-demo/-/blob/master/docker-compose.yml)
A minimal example taken from a [docker-compose.yml](https://0xacab.org/jfriedli/mat2-web-demo/-/blob/main/docker-compose.yml)
```yaml
version: '3'
......@@ -74,13 +74,13 @@ When it's done you'll make a merge request for from your branch into the `develo
| Branch | Description |
| ---------|:-------------:|
| Develop | The develop branch MIGHT contain non *operational code |
| Master | The Master branch MUST contain *operational code |
| Main | The main branch MUST contain *operational code |
*operational: This means the code itself contains only working features and finished
tasks that have been tested and are known to be working.
### Tags
We do use tags to mark releases. A tag SHOULD reference the master branch.
We do use tags to mark releases. A tag SHOULD reference the main branch.
On tag creation you have to submit a changelog.
### Configuration
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment