Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev to main #401

Merged
merged 5 commits into from
Feb 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions azure-pipelines-prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# 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: none
# branches:
# include:
# - main
# paths:
# exclude:
# - README.md

# 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
# 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
# of the pull request.
#
# Opt out of pull request validation
pr: none

# By default, use self-hosted agents
pool: Default

resources:
repositories:
# Azure DevOps repository
- repository: strategia-talous-pipelines
type: git
# project/repository
name: strategia-talous/strategia-talous-pipelines

extends:
template: azure-pipelines-drupal-prod.yml@strategia-talous-pipelines
36 changes: 36 additions & 0 deletions azure-pipelines-staging.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# 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:
- main
paths:
exclude:
- README.md

# 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
# 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
# of the pull request.
#
# Opt out of pull request validation
pr: none

# By default, use self-hosted agents
pool: Default

resources:
repositories:
# Azure DevOps repository
- repository: strategia-talous-pipelines
type: git
# project/repository
name: strategia-talous/strategia-talous-pipelines

extends:
template: azure-pipelines-drupal-staging.yml@strategia-talous-pipelines
36 changes: 18 additions & 18 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ status: true
dependencies:
config:
- field.field.paragraph.service_list.field_service_list_description
- field.field.paragraph.service_list.field_service_list_meta_load_mor
- field.field.paragraph.service_list.field_service_list_services
- field.field.paragraph.service_list.field_service_list_title
- paragraphs.paragraphs_type.service_list
Expand Down Expand Up @@ -42,14 +41,6 @@ content:
rows: 5
placeholder: ''
third_party_settings: { }
field_service_list_meta_load_mor:
type: string_textfield
weight: 4
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
field_service_list_services:
type: select2_entity_reference
weight: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ dependencies:
- field.field.paragraph.unit_search.field_unit_search_description
- field.field.paragraph.unit_search.field_unit_search_meta_button
- field.field.paragraph.unit_search.field_unit_search_meta_label
- field.field.paragraph.unit_search.field_unit_search_meta_load_more
- field.field.paragraph.unit_search.field_unit_search_meta_placehold
- field.field.paragraph.unit_search.field_unit_search_title
- field.field.paragraph.unit_search.field_unit_search_units
Expand Down Expand Up @@ -65,14 +64,6 @@ content:
size: 60
placeholder: ''
third_party_settings: { }
field_unit_search_meta_load_more:
type: string_textfield
weight: 7
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
field_unit_search_meta_placehold:
type: string_textfield
weight: 5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ status: true
dependencies:
config:
- field.field.paragraph.service_list.field_service_list_description
- field.field.paragraph.service_list.field_service_list_meta_load_mor
- field.field.paragraph.service_list.field_service_list_services
- field.field.paragraph.service_list.field_service_list_title
- paragraphs.paragraphs_type.service_list
Expand All @@ -22,14 +21,6 @@ content:
third_party_settings: { }
weight: 1
region: content
field_service_list_meta_load_mor:
type: string
label: hidden
settings:
link_to_entity: false
third_party_settings: { }
weight: 3
region: content
field_service_list_services:
type: entity_reference_entity_id
label: hidden
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ dependencies:
- field.field.paragraph.unit_search.field_unit_search_description
- field.field.paragraph.unit_search.field_unit_search_meta_button
- field.field.paragraph.unit_search.field_unit_search_meta_label
- field.field.paragraph.unit_search.field_unit_search_meta_load_more
- field.field.paragraph.unit_search.field_unit_search_meta_placehold
- field.field.paragraph.unit_search.field_unit_search_title
- field.field.paragraph.unit_search.field_unit_search_units
Expand Down Expand Up @@ -43,14 +42,6 @@ content:
third_party_settings: { }
weight: 3
region: content
field_unit_search_meta_load_more:
type: string
label: above
settings:
link_to_entity: false
third_party_settings: { }
weight: 6
region: content
field_unit_search_meta_placehold:
type: string
label: hidden
Expand Down
1 change: 0 additions & 1 deletion conf/cmi/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ module:
view_unpublished: 0
views_bulk_edit: 0
views_bulk_operations: 0
views_infinite_scroll: 0
views_ui: 0
pathauto: 1
content_translation: 10
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading