diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad0117e..e3910eb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,8 +91,8 @@ publish: services: - docker:25-dind only: - - develop - - master + - main + - production script: - docker info - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY @@ -103,7 +103,7 @@ deploy:dev: image: docker:25-cli stage: deploy only: - - develop + - main environment: name: dev url: http://api.dev.sahkoinsinoorikilta.fi @@ -125,7 +125,7 @@ deploy:production: stage: deploy image: docker:25-cli only: - - master + - production environment: name: production url: https://api.sahkoinsinoorikilta.fi diff --git a/README.md b/README.md index 7dc3a96..c1d1185 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,6 @@ Set up your SSH key authentication in GitLab Profile Settings. Then clone the re ```bash git clone git@gitlab.com:sahkoinsinoorikilta/vtmk/web2.0-backend.git cd web2.0-backend -git checkout develop ``` Copy env file for local use: @@ -109,11 +108,11 @@ Example of creating a feature branch: git checkout -b feature-branch-name ``` -When your changes are ready and the code works without errors, submit a merge request to `develop` in GitLab. Another developer reviews your changes and runs the merge. Feature branches should be closed on merge. +When your changes are ready and the code works without errors, submit a merge request to `main` in GitLab. Another developer reviews your changes and runs the merge. Feature branches should be closed on merge. -Bugfixes do not need their own feature branches and can be pushed straight to `develop`, but if the fix needs a notable amount of work, it should be done in a `bugfix` branch instead. +Bugfixes do not need their own feature branches and can be pushed straight to `main`, but if the fix needs a notable amount of work, it should be done in a `bugfix` branch instead. -Merge requests to `master` should be reviewed by multiple developers. Only a moderator can accept merge requests to `master`. +Merge requests to `main` should be reviewed by multiple developers. Only a moderator can accept merge requests to `production`. ### Linting @@ -153,4 +152,4 @@ For more information about deployment check **[infra](https://gitlab.com/sahkoin ## GitLab CI -All pushed changes go through the GitLab Continuous Integration, which consists of automated unit testing and linting. Make sure your changes pass both before merging to `develop` or `master`. +All pushed changes go through the GitLab Continuous Integration, which consists of automated unit testing and linting. Make sure your changes pass both before merging to `main` or `production`.