Merge template repository changes: remal-github-actions/template-typescript (#2983)

Co-authored-by: remal-github-actions <77626445+remal-github-actions+sync-with-template@users.noreply.github.com>

Author: remal

.editorconfig

@@ -432,6 +432,27 @@ indent_size = 2
 continuation_indent_size = 2
 ij_continuation_indent_size = 2
 
+[{*.tf,*.tfvars,*.tfvars.*}]
+max_line_length = 999
+tab_width = 2
+indent_size = 2
+continuation_indent_size = 2
+ij_continuation_indent_size = 2
+ij_hcl-terraform_array_wrapping = normal
+ij_hcl-terraform_import_providers_automatically = true
+ij_hcl-terraform_keep_blank_lines_in_code = 2
+ij_hcl-terraform_keep_indents_on_empty_lines = false
+ij_hcl-terraform_keep_line_breaks = true
+ij_hcl-terraform_object_wrapping = normal
+ij_hcl-terraform_property_alignment = on_equals
+ij_hcl-terraform_run_tf_fmt_on_reformat = true
+ij_hcl-terraform_space_after_comma = true
+ij_hcl-terraform_space_before_comma = false
+ij_hcl-terraform_spaces_around_assignment_operators = true
+ij_hcl-terraform_spaces_within_braces = false
+ij_hcl-terraform_spaces_within_brackets = false
+ij_hcl-terraform_wrap_long_lines = false
+
 [*.sql]
 max_line_length = 999
 

.github/workflows/cancel-pr-actions.yml

@@ -4,7 +4,6 @@ on:
   pull_request:
     types:
     - closed
-    - merged
 
 permissions:
   pull-requests: 'read'
@@ -17,4 +16,5 @@ jobs:
     timeout-minutes: 5
     steps:
     - name: Cancel PR actions
-      uses: remal-github-actions/cancel-pr-actions@v1
+      uses: Mergifyio/gha-cancel-workflow-runs-on-pr-close@v1
+      #uses: remal-github-actions/cancel-pr-actions@v1

.gitignore

@@ -1,3 +1,8 @@
+# Common:
+*~
+.DS_Store
+
+
 # Logs:
 log/
 !**/src/**/log/
@@ -28,6 +33,14 @@ build/
 node_modules/
 
 
+# Terraform state and backup files
+*.tfstate
+*.tfstate.backup
+*.tfstate.lock.info
+.terraform/
+.terraform.lock.hcl
+
+
 # IntelliJ IDEA plugins:
 .intellijPlatform/
 .qodana/
@@ -68,10 +81,6 @@ out/
 .project
 .settings/
 
-
-# Mac:
-.DS_Store
-
 # Remal GitHub actions:
 /.pnp.*
 /.yarn/*

.mergify/config.yml

@@ -24,6 +24,7 @@ pull_request_rules:
     review: { }
     merge:
       method: squash
+      commit_message_template: '{{ title }} (#{{ number }})'
 
 - name: Sync with template
   conditions:
@@ -44,3 +45,4 @@ pull_request_rules:
     review: { }
     merge:
       method: squash
+      commit_message_template: '{{ title }} (#{{ number }})'