diff --git a/README.md b/README.md index 2694a3b94..4cedebc70 100644 --- a/README.md +++ b/README.md @@ -6,14 +6,13 @@ This project offers citizens a way to apply for different city grants for their ## Environments -Env | Branch | Url ------- |-----------| ----- -local | * | [https://hel-fi-drupal-grant-applications.docker.so/](https://hel-fi-drupal-grant-applications.docker.so/) -development | * | [https://avustukset.dev.hel.ninja](https://avustukset.dev.hel.ninja) -testing | develop | [https://avustukset.test.hel.ninja](https://avustukset.test.hel.ninja) -staging | release/* | [https://avustukset.stage.hel.ninja](https://avustukset.stage.hel.ninja) -production | main | [https://avustukset.hel.fi](https://avustukset.hel.fi) (https://nginx-avustusasiointi-prod.apps.platta.hel.fi/ before release) - +| Env | Branch | Url | +|-------------|--------------------------|------------------------------------------------------------------------------------------------------------| +| local | `*` | [https://hel-fi-drupal-grant-applications.docker.so/](https://hel-fi-drupal-grant-applications.docker.so/) | +| development | `*` | [https://avustukset.dev.hel.ninja](https://avustukset.dev.hel.ninja) | +| testing | `dev` | [https://avustukset.test.hel.ninja](https://avustukset.test.hel.ninja) | +| staging | `main` | [https://avustukset.stage.hel.ninja](https://avustukset.stage.hel.ninja) | +| production | `refs/tags/YYYY-MM-DD.X` | [https://avustukset.hel.fi](https://avustukset.hel.fi) | ## Requirements diff --git a/azure-pipelines-prod.yml b/azure-pipelines-prod.yml index a64ea8dd7..8df5632c9 100644 --- a/azure-pipelines-prod.yml +++ b/azure-pipelines-prod.yml @@ -2,14 +2,7 @@ # Continuous integration (CI) triggers cause a pipeline to run whenever you push # an update to the specified branches or you push specified tags. -trigger: - batch: true - branches: - include: - - main - paths: - exclude: - - README.md +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 diff --git a/azure-pipelines-staging.yml b/azure-pipelines-staging.yml index d8f731ef8..8f833f0ee 100644 --- a/azure-pipelines-staging.yml +++ b/azure-pipelines-staging.yml @@ -3,14 +3,17 @@ # Continuous integration (CI) triggers cause a pipeline to run whenever you push # an update to the specified branches or you push specified tags. trigger: + batch: true branches: include: - - release/* - exclude: - - release/old* + - main paths: exclude: - - README.md + - '*.md' + - '.github/' + - 'azure-pipelines-dev.yml' + - 'azure-pipelines-test.yml' + - 'azure-pipelines-prod.yml' # 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 diff --git a/azure-pipelines-test.yml b/azure-pipelines-test.yml index 8dc01b268..3ed92852c 100644 --- a/azure-pipelines-test.yml +++ b/azure-pipelines-test.yml @@ -6,10 +6,14 @@ trigger: batch: true branches: include: - - develop + - dev paths: exclude: - - README.md + - '*.md' + - '.github/' + - 'azure-pipelines-dev.yml' + - 'azure-pipelines-staging.yml' + - 'azure-pipelines-prod.yml' # 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 diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index aac0767b3..000000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,28 +0,0 @@ -# File: drupal-helfi/azure-pipelines.yml - -# Continuous integration (CI) triggers cause a pipeline to run whenever you push -# an update to the specified branches or you push specified tags. -trigger: - branches: - include: - - dev - paths: - exclude: - - README.md - -# By default, use self-hosted agents -pool: Default - -# Opting out of pull request validation -pr: none - -resources: - repositories: - # Azure DevOps repository - - repository: avustusasiointi-pipelines - type: git - # project/repository - name: avustusasiointi/avustusasiointi-pipelines - -extends: - template: azure-pipelines-drupal.yml@drupal-helfi