diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 88b56a79..aa994a07 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -3,7 +3,7 @@ name: release-please on: push: branches: - - master + - main permissions: contents: write diff --git a/README.md b/README.md index 4c2d1e96..1a4e3a60 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ git clone https://github.com/City-of-Helsinki/kerrokantasi.git cd kerrokantasi ``` -Uncomment line https://github.com/City-of-Helsinki/kerrokantasi/blob/master/docker-compose.yml#L29 to activate +Uncomment line https://github.com/City-of-Helsinki/kerrokantasi/blob/main/compose.yaml#L27-L28 to activate configuring the dev environment with a local file. Copy the development config file example `config_dev.toml.example` diff --git a/pipelines/kerrokantasi-api-dev.yml b/pipelines/kerrokantasi-api-dev.yml index 52de4216..c2a21a29 100644 --- a/pipelines/kerrokantasi-api-dev.yml +++ b/pipelines/kerrokantasi-api-dev.yml @@ -4,7 +4,7 @@ trigger: batch: true branches: include: - - master + - main paths: exclude: - '*release-please*' diff --git a/pipelines/kerrokantasi-api-review.yml b/pipelines/kerrokantasi-api-review.yml index ac688fc4..a24e105b 100644 --- a/pipelines/kerrokantasi-api-review.yml +++ b/pipelines/kerrokantasi-api-review.yml @@ -8,19 +8,19 @@ trigger: none # Pull request (PR) triggers cause a pipeline to run whenever a pull request is -# opened with one of the specified target branches, or when updates are made to +# opened with one of the specified target branches, or when updates are made to # such a pull request. # -# GitHub creates a new ref when a pull request is created. The ref points to a -# merge commit, which is the merged code between the source and target branches +# GitHub creates a new ref when a pull request is created. The ref points to a +# merge commit, which is the merged code between the source and target branches # of the pull request. # -# Pull request validation +# Pull request validation pr: # PR target branch branches: include: - - master + - main paths: exclude: - '*release-please*'